Merged in SL-17274_gbuffer_flags (pull request #1030)

SL-17274 gbuffer flags

Approved-by: Dave Parks

2 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
index 6841a8194f..4379024680 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
@@ -195,5 +195,5 @@ void main()
     // Gamma correct for WL (soft clip effect).
     frag_data[0] = vec4(color.rgb, 1.0);
     frag_data[1] = vec4(0.0, 0.0, 0.0, 0.0);
-    frag_data[2] = vec4(0.0, 0.0, 0.0, 1.0);  // 1.0 in norm.w masks off fog
+    frag_data[2] = vec4(0.0, 0.0, 0.0, GBUFFER_FLAG_SKIP_ATMOS);  // 1.0 in norm.w masks off fog
 }
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 7700d16007..dfb93c17dc 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -139,7 +139,7 @@ void main()
         color                = mix(color.rgb, reflected_color, envIntensity);
     }
 
-    if (norm.w < 0.5)
+    if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_ATMOS))
     {
         color = mix(atmosFragLighting(color, additive, atten), fullbrightAtmosTransportFrag(color, additive, atten), diffuse.a);
         color = mix(scaleSoftClipFrag(color), fullbrightScaleSoftClip(color), diffuse.a);