From 344c5196b408f0382f8424f3b2e940d76050358c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 11 Nov 2022 15:39:06 -0600
Subject: [PATCH] SL-18566 Fix for legacy transparency being opaque under
water.
---
.../app_settings/shaders/class1/environment/waterFogF.glsl | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
index 011b3c86438..4a0bb3fe986 100644
--- a/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
@@ -68,7 +68,6 @@ vec4 applyWaterFogView(vec3 pos, vec4 color)
float D = pow(0.98, l*kd);
color.rgb = color.rgb * D + kc.rgb * L;
- color.a = kc.a + color.a;
return color;
}
@@ -114,7 +113,6 @@ vec4 applyWaterFogViewLinear(vec3 pos, vec4 color)
float D = pow(0.98, l * kd);
color.rgb = color.rgb * D + kc.rgb * L;
- color.a = kc.a + color.a;
return color;
}
@@ -122,6 +120,6 @@ vec4 applyWaterFogViewLinear(vec3 pos, vec4 color)
vec4 applyWaterFog(vec4 color)
{
//normalize view vector
- return applyWaterFogView(getPositionEye(), color);
+ return applyWaterFogViewLinear(getPositionEye(), color);
}
--
GitLab