Merged in SL-12850 (pull request #34)

SL-12850

Approved-by: Dave Houlton <euclid@lindenlab.com>

indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl

@@ -154,8 +154,6 @@ vec3 post_diffuse = color.rgb;
         }
        
  vec3 post_spec = color.rgb;
- 
-        color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
 
         if (envIntensity > 0.0)
         { //add environmentmap
@@ -165,7 +163,11 @@ vec3 post_diffuse = color.rgb;
             color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality <= Mid+
 #endif
         }
-        
+        else
+        {
+            color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+        }
+
 vec3 post_env = color.rgb;
 
         if (norm.w < 1)

indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl

@@ -161,8 +161,6 @@ vec3 post_diffuse = color.rgb;
         }
        
  vec3 post_spec = color.rgb;
- 
-        color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
 
         if (envIntensity > 0.0)
         { //add environmentmap
@@ -172,7 +170,11 @@ vec3 post_diffuse = color.rgb;
             color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality >= High
 #endif
         }
-        
+        else
+        {
+            color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
+        }
+
 vec3 post_env = color.rgb;
 
         if (norm.w < 1)