diff options
| author | Rye Mutt <rye@lindenlab.com> | 2024-10-01 11:52:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-01 11:52:05 -0400 |
| commit | 56fbc6a87ff807fd2be3607cd2ca423030032c5b (patch) | |
| tree | 04f08cc06a0a4135054015e40a7dbcae182a9f25 /indra/newview/pipeline.cpp | |
| parent | f3df004180ce9494d9d0e8b6d4841b226b2a3a53 (diff) | |
| parent | 0e0b9eb3b397b213bc6f268eb1690c4794cf3ed3 (diff) | |
Merge branch 'develop' into rye/continued-sdl-cleanup
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e36cb795bd..8a44148e7f 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8599,13 +8599,12 @@ void LLPipeline::renderDeferredLighting() LLDrawable* drawablep = *iter; LLVOVolume* volume = drawablep->getVOVolume(); LLVector3 center = drawablep->getPositionAgent(); - F32* c = center.mV; F32 light_size_final = volume->getLightRadius() * 1.5f; F32 light_falloff_final = volume->getLightFalloff(DEFERRED_LIGHT_FALLOFF); sVisibleLightCount++; - glm::vec3 tc(glm::make_vec3(c)); + glm::vec3 tc(glm::make_vec3(LLVector4(center).mV)); tc = mul_mat4_vec3(mat, tc); setupSpotLight(gDeferredMultiSpotLightProgram, drawablep); @@ -10145,7 +10144,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera) view[j] = glm::inverse(view[j]); //llassert(origin.isFinite()); - glm::vec3 origin_agent(glm::make_vec3(origin.mV)); + glm::vec3 origin_agent(glm::make_vec3(LLVector4(origin).mV)); //translate view to origin origin_agent = mul_mat4_vec3(view[j], origin_agent); |