summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl2
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl2
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 69a694a6cd..20ac78947b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -164,7 +164,9 @@ vec3 post_diffuse = color.rgb;
#endif
}
else
+ {
color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+ }
vec3 post_env = color.rgb;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index a1366eec01..9c7a4df767 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -171,7 +171,9 @@ vec3 post_diffuse = color.rgb;
#endif
}
else
+ {
color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+ }
vec3 post_env = color.rgb;