diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-13 21:34:28 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-13 21:48:36 +0300 |
| commit | 812e6285c55bd8ff03cf7bb1b5fbc5e04347f20d (patch) | |
| tree | 78e506457beadd14345d8dc64f44a1b3b09fe81f /indra/newview/pipeline.cpp | |
| parent | deb1c21a7aaabf035b8b86aa3860b259b411d12d (diff) | |
SL-12007 Toggling 'Transparent water' checkbox has no effect
Opaque water is not compatible with ALM
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b41ac29906..9f6fd2ce6b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -329,6 +329,7 @@ bool LLPipeline::sDelayVBUpdate = true; bool LLPipeline::sAutoMaskAlphaDeferred = true; bool LLPipeline::sAutoMaskAlphaNonDeferred = false; bool LLPipeline::sDisableShaders = false; +bool LLPipeline::sRenderTransparentWater = true; bool LLPipeline::sRenderBump = true; bool LLPipeline::sBakeSunlight = false; bool LLPipeline::sNoAlpha = false; @@ -1044,6 +1045,12 @@ bool LLPipeline::allocateShadowBuffer(U32 resX, U32 resY) } //static +void LLPipeline::updateRenderTransparentWater() +{ + sRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater"); +} + +//static void LLPipeline::updateRenderBump() { sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); @@ -1055,6 +1062,7 @@ void LLPipeline::updateRenderDeferred() bool deferred = (bool(RenderDeferred && LLRenderTarget::sUseFBO && LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + LLPipeline::sRenderTransparentWater && LLPipeline::sRenderBump && RenderAvatarVP && WindLightUseAtmosShaders)) && |