summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolmaterials.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-01-08 23:16:48 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-01-08 23:16:48 +0200
commit5a829048827a1b496401db5b715554694436fd9a (patch)
treedf540d2b9e3f08aede0138354281357f8b0dd7d2 /indra/newview/lldrawpoolmaterials.cpp
parent9659527ffd2226293993d81ecca72982a56756cf (diff)
parent77395eddc911e0801e50fd693f7bbaee8046aa95 (diff)
Merge branch 'main' into DRTVWR-599-maint-Z
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
-rw-r--r--indra/newview/lldrawpoolmaterials.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp
index 6a7e05ac74..c0e4ed38c1 100644
--- a/indra/newview/lldrawpoolmaterials.cpp
+++ b/indra/newview/lldrawpoolmaterials.cpp
@@ -82,14 +82,7 @@ void LLDrawPoolMaterials::beginDeferredPass(S32 pass)
U32 idx = shader_idx[pass];
- if (LLPipeline::sUnderWaterRender)
- {
- mShader = &(gDeferredMaterialWaterProgram[idx]);
- }
- else
- {
- mShader = &(gDeferredMaterialProgram[idx]);
- }
+ mShader = &(gDeferredMaterialProgram[idx]);
if (rigged)
{