diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-14 22:43:17 +0300 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-19 14:43:20 -0500 |
| commit | 1acd92c30c88a9718385f29a558b77bd20588764 (patch) | |
| tree | 255f11409a443cb9de262ab6fad3e9a83a42860e /indra/newview/lldrawpoolwater.cpp | |
| parent | 58cd9d547c57b4491c3a85b7aade0f56ae7397c8 (diff) | |
SL-15993 Disabling transparent water should not disable advanced lighting
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 5f9e623b4c..2f3c52ecd2 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -137,6 +137,14 @@ void LLDrawPoolWater::endPostDeferredPass(S32 pass) void LLDrawPoolWater::renderDeferred(S32 pass) { LL_RECORD_BLOCK_TIME(FTM_RENDER_WATER); + + if (!LLPipeline::sRenderTransparentWater) + { + // Will render opaque water without use of ALM + render(pass); + return; + } + deferred_render = TRUE; shade(); deferred_render = FALSE; @@ -340,6 +348,11 @@ void LLDrawPoolWater::renderOpaqueLegacyWater() LL_PROFILE_ZONE_SCOPED; LLVOSky *voskyp = gSky.mVOSkyp; + if (voskyp == NULL) + { + return; + } + LLGLSLShader* shader = NULL; if (LLGLSLShader::sNoFixedFunction) { |