diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
| commit | f6dec0bf7b9baa990fa26398e77faf5a410b8be6 (patch) | |
| tree | 9ed732e6801157018faff52d4782c2688fefdd73 /indra/newview/lldrawpoolmaterials.cpp | |
| parent | 0fd4a8b59677e1a85d19308379ab9967345749dc (diff) | |
| parent | 3c858d7e2d6633df14df473a918d2fb848403972 (diff) | |
Merge tag '7.1.2-release'
source for viewer 7.1.2.7215179142
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 9 |
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) { |