From 73404da266ffd5560d6faef5243d45c3478c1d6e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 1 May 2013 16:48:27 -0500
Subject: [PATCH] Fix for sky being too bright with advanced lighting enabled
---
.../app_settings/shaders/class1/deferred/softenLightF.glsl | 4 ++--
.../app_settings/shaders/class2/deferred/softenLightF.glsl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 5d936233fe9..a1dff9188f9 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -321,8 +321,6 @@ void main()
col += spec_contrib;
}
- col = mix(col.rgb, diffuse.rgb, diffuse.a);
-
if (envIntensity > 0.0)
{ //add environmentmap
vec3 env_vec = env_mat * refnormpersp;
@@ -332,6 +330,8 @@ void main()
col = atmosLighting(col);
col = scaleSoftClip(col);
+
+ col = mix(col.rgb, diffuse.rgb, diffuse.a);
}
frag_color.rgb = col;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 15584548cc7..10a598a85c6 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -330,8 +330,6 @@ void main()
col += spec_contrib;
}
- col = mix(col, diffuse.rgb, diffuse.a);
-
if (envIntensity > 0.0)
{ //add environmentmap
vec3 env_vec = env_mat * refnormpersp;
@@ -341,6 +339,8 @@ void main()
col = atmosLighting(col);
col = scaleSoftClip(col);
+
+ col = mix(col.rgb, diffuse.rgb, diffuse.a);
}
--
GitLab