summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2020-03-13 11:46:13 -0700
committerPtolemy <ptolemy@lindenlab.com>2020-03-13 11:46:13 -0700
commit744872b43d4b538a828dad116c46eed3d6d35436 (patch)
treecda81434d79a91f86219dcede6a4f7cdb23108e8 /indra/newview/app_settings/shaders/class2
parent4034d57bb8ffed4891c5517c94fd4ccb10a41160 (diff)
SL-12850
Diffstat (limited to 'indra/newview/app_settings/shaders/class2')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 15a3bc349a..63b0f0b5c8 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -161,8 +161,6 @@ vec3 post_diffuse = color.rgb;
}
vec3 post_spec = color.rgb;
-
- color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
if (envIntensity > 0.0)
{ //add environmentmap
@@ -170,9 +168,12 @@ vec3 post_diffuse = color.rgb;
vec3 reflected_color = textureCube(environmentMap, env_vec).rgb;
#if !defined(SUNLIGHT_KILL)
color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality >= High
+//color.rgb = reflected_color.rgb;
#endif
}
-
+ else
+ color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+
vec3 post_env = color.rgb;
if (norm.w < 1)