summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2020-11-05 20:50:15 -0800
committerPtolemy <ptolemy@lindenlab.com>2020-11-05 20:50:15 -0800
commitfb8e642052bad3f83565574a2dcab1e1deb1cd47 (patch)
treeae0c6198e8e6ce10f4d516d7384933e96a92c2c9 /indra/newview
parent2d2cab2ccc0bd1fbd508cdb2627fccb49a38be01 (diff)
SL-14275: Don't render clouds in water reflection
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c980851f00..a7f135139d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9329,10 +9329,22 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
//initial sky pass (no user clip plane)
{ //mask out everything but the sky
gPipeline.pushRenderTypeMask();
- gPipeline.andRenderTypeMask(LLPipeline::RENDER_TYPE_SKY,
- LLPipeline::RENDER_TYPE_WL_SKY,
- LLPipeline::RENDER_TYPE_CLOUDS,
- LLPipeline::END_RENDER_TYPES);
+
+ if (reflection_detail >= WATER_REFLECT_MINIMAL)
+ {
+ gPipeline.andRenderTypeMask(
+ LLPipeline::RENDER_TYPE_SKY,
+ LLPipeline::RENDER_TYPE_WL_SKY,
+ LLPipeline::RENDER_TYPE_CLOUDS,
+ LLPipeline::END_RENDER_TYPES);
+ }
+ else
+ {
+ gPipeline.andRenderTypeMask(
+ LLPipeline::RENDER_TYPE_SKY,
+ LLPipeline::RENDER_TYPE_WL_SKY,
+ LLPipeline::END_RENDER_TYPES);
+ }
updateCull(camera, mSky);
stateSort(camera, mSky);