From 032848472c1895040d5323948fc67e8f47c5fad3 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 18 Jun 2019 11:04:04 -0700 Subject: SL-11372 Fix incorrect diffuse handling in class1 softenLight from contrib. --- indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3