SL-11087, SL-11086, SL-11092

Fix sun/moon glow factor bustage.

Make darkness an option.

Fix moon fade shader logic getting confused when sun was below horizon.

2 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
index b05d544938..54ec534d14 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
@@ -224,14 +224,14 @@ void main()
             col = dlit*lit*diff_tex*shadow;
 
             // unshadowed for consistency between forward and deferred?
-            amb_da += (da*0.5+0.5) * (1.0-shadow) * proj_ambiance;
+            amb_da += (da*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
         }
         
         //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0);
         vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod);
 
         // use unshadowed for consistency between forward and deferred?
-        amb_da += (da*da*0.5+0.5) * (1.0-shadow) * proj_ambiance;
+        amb_da += (da*da*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
         amb_da *= dist_atten * noise;
         amb_da = min(amb_da, 1.0-lit);
 
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
index a3ff754849..2ef7cffe9d 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
@@ -220,13 +220,13 @@ void main()
 		
 			col = dlit*lit*diff_tex*shadow;
 
-			amb_da += (da*0.5+0.5) * (1.0-shadow) * proj_ambiance;
+			amb_da += (da*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
 		}
 		
 		//float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0);
 		vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod);
 							
-		amb_da += (da*da*0.5+0.5)*(1.0-shadow)*proj_ambiance;
+		amb_da += (da*da*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
 		amb_da *= dist_atten * noise;
 		amb_da = min(amb_da, 1.0-lit);