summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-11-16 18:16:24 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-11-16 18:16:24 +0000
commitb1964a47005d7bbd99258af7f4eaf4b12baeb423 (patch)
tree8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
parente914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff)
parent17f71efce08ed4e677b497f4734d6f9f1fef56a3 (diff)
Merged in DV528-merge-6.5.1 (pull request #774)
DRTVWR-528 merge up to 6.5.1
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
index 0916797259..9c89c09573 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
@@ -41,13 +41,13 @@ void default_lighting_water()
{
vec4 color = diffuseLookup(vary_texcoord0.xy);
- color.rgb *= vertex_color.rgb;
-
if (color.a < minimum_alpha)
{
discard;
}
+ color.rgb *= vertex_color.rgb;
+
color.rgb = atmosLighting(color.rgb);
frag_color = applyWaterFog(color);