summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-22 11:00:30 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-22 11:00:30 -0700
commitdb091d23db70952b4ad8b610ef02942a8f13f223 (patch)
tree8e7a4013eb2927692b735b479de417e501d673e6 /indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
parente9dbee00262a437e4b3f971b37ea636e92032133 (diff)
SL-10969
Fix linear attenuation on forward projector lighting. Revert setup of falloff to prev code. Revert deferred water spec and tweak refl/refr blend.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl')
-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 40bb705326..4ab68eaf3b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -156,7 +156,7 @@ vec3 post_diffuse = color.rgb;
vec3 post_spec = color.rgb;
#ifndef WATER_FOG
- color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+ color.rgb += diffuse_srgb.rgb * diffuse_srgb.a;
#endif
if (envIntensity > 0.0)