From d33655828c104d1afe484b63093ad5aab1571a3c Mon Sep 17 00:00:00 2001
From: Runitai Linden <davep@lindenlab.com>
Date: Thu, 5 Mar 2020 11:58:58 -0600
Subject: [PATCH] Reenable water fog in materialF.glsl (oops)
---
.../app_settings/shaders/class1/deferred/materialF.glsl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 586ce4a9b7c..18293f4c119 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -421,16 +421,16 @@ void main()
color = scaleSoftClipFrag(color);
-/*#ifdef WATER_FOG
+#ifdef WATER_FOG
vec4 temp = applyWaterFogView(pos, vec4(color.rgb, al));
color.rgb = temp.rgb;
al = temp.a;
-#endif*/
+#endif
}
-
- color.rgb = linear_to_srgb(color.rgb);
+ color.rgb = linear_to_srgb(color.rgb);
+
frag_color = vec4(color, al);
#else // mode is not DIFFUSE_ALPHA_MODE_BLEND, encode to gbuffer
--
GitLab