summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2021-11-23 16:35:14 +0000
committerDave Parks <davep@lindenlab.com>2021-11-23 16:35:14 +0000
commit408ac8f18cfb8f1c29381b0285f9cae91f5b685a (patch)
tree5fcdef6eb71815d69dc5261b1f5a8cec202b7e65 /indra
parentc2f96c78266e1a8191a4b1b2c9a832f1b7f128ea (diff)
SL-16401 Fix for rendering above water things into the water refraction render target.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4710fdb085..d9d97ac1e5 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2348,6 +2348,15 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
LL_RECORD_BLOCK_TIME(FTM_CULL);
+ if (planep != nullptr)
+ {
+ camera.setUserClipPlane(*planep);
+ }
+ else
+ {
+ camera.disableUserClipPlane();
+ }
+
grabReferences(result);
sCull->clear();
@@ -2402,11 +2411,6 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX);
}
- if (!sReflectionRender)
- {
- camera.disableUserClipPlane();
- }
-
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
{