summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-06-18 11:04:04 -0700
committerGraham Linden <graham@lindenlab.com>2019-06-18 11:04:04 -0700
commit032848472c1895040d5323948fc67e8f47c5fad3 (patch)
treec173a669c1f3b26ccc1624ba1cd09507ed45c7fe
parent9d138b1440fc68d5f4b687fbf4e8635d6d2bdfe5 (diff)
SL-11372
Fix incorrect diffuse handling in class1 softenLight from contrib.
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index aa55b36d4a..5fb3dc12e6 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -159,7 +159,7 @@ vec3 post_diffuse = color.rgb;
vec3 post_spec = color.rgb;
#ifndef WATER_FOG
- color.rgb += diffuse_srgb.rgb * diffuse_srgb.a;
+ color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
#endif
if (envIntensity > 0.0)