diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-12 17:34:13 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-12 17:44:40 +0200 |
| commit | 7ce17542d46ff7cb6b88d33d4cad5ba4808c6c58 (patch) | |
| tree | a29ce0a5bab1803b186fff9649954d68de78c7c0 /indra/newview/lldrawpoolwater.cpp | |
| parent | 0fa3d7705fb6a42410d1578b1fab5b7952a59e7c (diff) | |
DRTVWR-528 Reverting multiple commits due to moving them into D546 branch
This reverts commits
9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933
53c0144dd272470172591b967a84beaa4019b728 SL-11687
492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056
b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391
921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561
639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 0cf36e4e8a..aa426cd785 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -137,14 +137,6 @@ 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; @@ -347,11 +339,6 @@ void LLDrawPoolWater::renderOpaqueLegacyWater() { LLVOSky *voskyp = gSky.mVOSkyp; - if (voskyp == NULL) - { - return; - } - LLGLSLShader* shader = NULL; if (LLGLSLShader::sNoFixedFunction) { |