Lighting WIP

Consistency across class2/3/ALM lighting.

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index f49f274de0..d11b81d2d3 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -194,6 +194,8 @@ void main()
     float final_alpha = diff.a;
 #endif
 
+    vec3 gamma_diff = diff.rgb;
+
     diff.rgb = srgb_to_linear(diff.rgb);
 
     vec3 sunlit;
@@ -239,10 +241,12 @@ vec3 post_sunlight = color.rgb;
 vec3 post_diffuse = color.rgb;
 
     //color.rgb = mix(diff.rgb, color.rgb, final_alpha);
-    
-    color.rgb = atmosFragLighting(color.rgb, additive, atten) * 2.0;
+
+    color.rgb = atmosFragLighting(color.rgb, additive, atten);
     color.rgb = scaleSoftClipFrag(color.rgb);
 
+    //color.rgb = srgb_to_linear(color.rgb);
+
     vec4 light = vec4(0,0,0,0);
 
    #define LIGHT_LOOP(i) light.rgb += calcPointLightOrSpotLight(light_diffuse[i].rgb, diff.rgb, pos.xyz, norm, light_position[i], light_direction[i].xyz, light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z, light_attenuation[i].w * 0.5);