diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-01-24 14:37:33 -0800 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-01-24 14:37:33 -0800 |
| commit | 373b06398c274eee476e4aa9c35b9c6327f9d45f (patch) | |
| tree | 4a324b36ab896d9507374e71e15f9ec064b41add /indra/newview/lldrawpoolmaterials.cpp | |
| parent | bd9c0a2e658e183bb8a321cdce546f10b6d76afe (diff) | |
| parent | c22aefafb3d05be37965361913c02568fa10adf6 (diff) | |
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
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 373103ce0a..ec229711ea 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) { |