1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 705cc2f04e..da2eb47e3b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -119,7 +119,7 @@ vec3 post_ambient = color.rgb;
 
 vec3 post_sunlight = color.rgb;
 
-        color.rgb *= diffuse_srgb.rgb;
+        color.rgb *= diffuse_linear.rgb;
 
 vec3 post_diffuse = color.rgb;
 
@@ -157,7 +157,7 @@ vec3 post_diffuse = color.rgb;
 #ifdef WATER_FOG
         color.rgb += diffuse_srgb.rgb * diffuse_srgb.a * 0.25;
 #else
-        color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+        color.rgb = mix(color.rgb, diffuse_linear.rgb, diffuse_linear.a);
 #endif
 
         if (envIntensity > 0.0)
@@ -201,7 +201,7 @@ vec3 post_atmo = color.rgb;
 
 // convert to linear as fullscreen lights need to sum in linear colorspace
 // and will be gamma (re)corrected downstream...
-        color.rgb = srgb_to_linear(color.rgb);
+        //color.rgb = srgb_to_linear(color.rgb);
     }
 
 // linear debuggables
@@ -209,7 +209,7 @@ vec3 post_atmo = color.rgb;
 //color.rgb = vec3(ambient);
 //color.rgb = vec3(scol);
 //color.rgb = diffuse_linear.rgb;
-
+    
     frag_color.rgb = color.rgb;
-    frag_color.a = bloom;
+    frag_color.a = 0.0; //bloom;
 }