diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-14 22:43:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-15 20:04:36 +0300 |
| commit | 9b5b2eac82b1f423daec463b3d55d0f3d3979bbc (patch) | |
| tree | b6f2c0f64e7561757923861da4b65feac648b79b /indra/newview/lldrawpoolwater.cpp | |
| parent | 1b15b8cda7853e55a91fd0140311ed69f3cca677 (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 aa426cd785..0cf36e4e8a 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; @@ -339,6 +347,11 @@ void LLDrawPoolWater::renderOpaqueLegacyWater() { LLVOSky *voskyp = gSky.mVOSkyp; + if (voskyp == NULL) + { + return; + } + LLGLSLShader* shader = NULL; if (LLGLSLShader::sNoFixedFunction) { |