From 3792c3c7debb428d9727136afaa8b16d312abd42 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Fri, 13 Mar 2020 12:37:14 -0700
Subject: SL-12850 Adhere to coding standard
---
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 ++
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 ++
2 files changed, 4 insertions(+)
(limited to 'indra')
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;
--
cgit v1.2.3