summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-11-11 15:39:06 -0600
committerDave Parks <davep@lindenlab.com>2022-11-11 15:39:06 -0600
commit344c5196b408f0382f8424f3b2e940d76050358c (patch)
tree683a8f8c9af093ddb45175a0a23f3cae53a9586b /indra
parent8a19c8e073e6f34dc1579ed7ab2ac64f567a1793 (diff)
SL-18566 Fix for legacy transparency being opaque under water.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl4
1 files changed, 1 insertions, 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 011b3c8643..4a0bb3fe98 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);
}