summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-06-28 10:58:32 -0700
committerGraham Linden <graham@lindenlab.com>2019-06-28 10:58:32 -0700
commitc1697079937eade10765353039b4801d029c72fa (patch)
tree22e723196c19e3b8c793d9448084af982543ba70 /indra/newview
parentb659e5596e6612d83ce41dd6ce44228103851875 (diff)
SL-9928
Remove spec killing additive fix for 1491 to unbreak fog.
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, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 4825418fe3..f9fe091124 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -176,7 +176,7 @@ vec3 post_env = color.rgb;
if (norm.w < 1)
{
#if !defined(SUNLIGHT_KILL)
- additive *= spec.a;
+ //additive *= spec.a;
float additive_angular_atten = max(0.0, dot(light_dir, normalize(pos.xyz)));
color = atmosFragLighting(color, additive * additive_angular_atten, atten);
color = scaleSoftClipFrag(color);
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index d4d69f07e8..d1b49d8820 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -185,7 +185,7 @@ vec3 post_env = color.rgb;
{
#if !defined(SUNLIGHT_KILL)
vec3 p = normalize(pos.xyz);
- additive *= spec.a;
+ //additive *= spec.a;
float additive_angular_atten = max(0.0, dot(light_dir.xyz, p.xyz));
color = atmosFragLighting(color, additive * additive_angular_atten, atten);
color = scaleSoftClipFrag(color);