diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-04 12:20:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-04 12:20:19 -0500 |
| commit | 1900df361558313f10e8b27ada03bcefd41241d9 (patch) | |
| tree | 0ec5b6a71723f5f2dd8244ca9a4a74408e2e5b0c /indra/newview/llreflectionmapmanager.cpp | |
| parent | 7d426815019ac5394e5821f1c6ba374e12606aaa (diff) | |
SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still busted). WIP on reflection probe/PBR driven water shader.
Diffstat (limited to 'indra/newview/llreflectionmapmanager.cpp')
| -rw-r--r-- | indra/newview/llreflectionmapmanager.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp index 4b2a2a382a..cbefb93ca9 100644 --- a/indra/newview/llreflectionmapmanager.cpp +++ b/indra/newview/llreflectionmapmanager.cpp @@ -34,6 +34,7 @@ #include "llviewershadermgr.h" #include "llviewercontrol.h" #include "llenvironment.h" +#include "llstartup.h" extern BOOL gCubeSnapshot; extern BOOL gTeleportDisplay; @@ -63,7 +64,7 @@ struct CompareProbeDistance // helper class to seed octree with probes void LLReflectionMapManager::update() { - if (!LLPipeline::sReflectionProbesEnabled || gTeleportDisplay) + if (!LLPipeline::sReflectionProbesEnabled || gTeleportDisplay || LLStartUp::getStartupState() < STATE_PRECACHE) { return; } @@ -212,7 +213,11 @@ LLReflectionMap* LLReflectionMapManager::addProbe(LLSpatialGroup* group) { LLReflectionMap* probe = new LLReflectionMap(); probe->mGroup = group; - probe->mOrigin = group->getOctreeNode()->getCenter(); + + if (group) + { + probe->mOrigin = group->getOctreeNode()->getCenter(); + } if (gCubeSnapshot) { //snapshot is in progress, mProbes is being iterated over, defer insertion until next update @@ -272,7 +277,9 @@ LLReflectionMap* LLReflectionMapManager::registerSpatialGroup(LLSpatialGroup* gr return addProbe(group); } } - +#endif + +#if 0 if (group->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_TERRAIN) { OctreeNode* node = group->getOctreeNode(); |