From c1697079937eade10765353039b4801d029c72fa Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 28 Jun 2019 10:58:32 -0700
Subject: SL-9928
Remove spec killing additive fix for 1491 to unbreak fog.
---
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 +-
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
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);
--
cgit v1.2.3