summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolalpha.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-05-25 16:16:36 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-05-25 16:16:36 -0500
commita70575091bcedc762b47bc1115c4aa8ebdb58778 (patch)
tree391ad8837c7fd1ce5b086779eb4621f82cd5aea7 /indra/newview/lldrawpoolalpha.cpp
parent30311e5229bff107c2722de68aabb656d9b8f097 (diff)
parentcbd17fce86cc30434d6d665338a7d771bddcad8b (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
-rw-r--r--indra/newview/lldrawpoolalpha.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 67bc0463c8..6aa2316589 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -197,7 +197,10 @@ void LLDrawPoolAlpha::renderPostDeferred(S32 pass)
prepare_alpha_shader(&materialShader[i], false, true, water_sign);
}
- pbr_shader = LLPipeline::sRenderingHUDs ? &gHUDPBRAlphaProgram : &gDeferredPBRAlphaProgram;
+ pbr_shader =
+ (LLPipeline::sUnderWaterRender) ? &gDeferredPBRAlphaWaterProgram :
+ (LLPipeline::sRenderingHUDs) ? &gHUDPBRAlphaProgram :
+ &gDeferredPBRAlphaProgram;
prepare_alpha_shader(pbr_shader, false, true, water_sign);