diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-14 11:07:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-14 11:07:13 -0700 |
| commit | 31a3423239a1312e430909ad899d60003363541f (patch) | |
| tree | 93a7cd46544e69543794654b29068a74437af7d1 /indra/newview/pipeline.cpp | |
| parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
| parent | 1e9e5a7b7629276d509c352699fb5891c2dc6587 (diff) | |
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 42e74c05ed..5274b3bd40 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2268,7 +2268,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) |