From 3b3d3d88d1755ac08c7d22721fa3fe1657f7c5fd Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 24 May 2022 11:38:23 -0500
Subject: [PATCH] SL-17287 Don't update reflection probes when PBR is disabled.

---
 indra/newview/llreflectionmapmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index db6622239dc..34055653d48 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -67,7 +67,7 @@ struct CompareProbeDistance
 // helper class to seed octree with probes
 void LLReflectionMapManager::update()
 {
-    if (!LLPipeline::sRenderDeferred || gTeleportDisplay)
+    if (!LLPipeline::sRenderPBR || gTeleportDisplay)
     {
         return;
     }
@@ -634,6 +634,7 @@ void LLReflectionMapManager::updateUniforms()
 
 void LLReflectionMapManager::setUniforms()
 {
+    llassert(LLPipeline::sRenderPBR);
     if (mUBO == 0)
     { 
         updateUniforms();
@@ -644,7 +645,6 @@ void LLReflectionMapManager::setUniforms()
 
 void renderReflectionProbe(LLReflectionMap* probe)
 {
-
     F32* po = probe->mOrigin.getF32ptr();
 
     //draw orange line from probe to neighbors
-- 
GitLab