summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2024-05-08 13:40:58 -0700
committerGitHub <noreply@github.com>2024-05-08 13:40:58 -0700
commit54816bdf81c05dfeb0f4fa35f4e222fdd8126057 (patch)
tree8d4448cceef2fd4ec395e099866e98e0faf50e76 /indra/newview
parentca5e89d741b3618ab1dc681ecb6f75e5884988d7 (diff)
Fix for mirrors not functioning properly under water. (#1436)
* #1165 Fix for clipping and culling for mirrors under water.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 341c9706f8..8b1e46343b 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2269,7 +2269,8 @@ static LLTrace::BlockTimerStatHandle FTM_CULL("Object Culling");
// static
bool LLPipeline::isWaterClip()
{
- return (!sRenderTransparentWater || gCubeSnapshot) && !sRenderingHUDs;
+ // We always pretend that we're not clipping water when rendering mirrors.
+ return (gPipeline.mHeroProbeManager.isMirrorPass()) ? false : (!sRenderTransparentWater || gCubeSnapshot) && !sRenderingHUDs;
}
void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result)