SL-10181, SL-10546

Fix distortion map rendering in deferred mode not including underwater fog effects.

Fix distortion map rendering not including post-deferred content at all.

Fix distortion map rendering not including anything but sky when camera is underwater.

Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 9883ece648..1ba10fa8b7 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -215,11 +215,11 @@ void main()
     // keep it linear
     //
     color.rgb += light.rgb;
+#endif
 
 #ifdef WATER_FOG
     color = applyWaterFogView(pos.xyz, color);
 #endif
-#endif
 
     frag_color = color;
 }