From d50aeed8de119bb9ddcb74128bcb05fe7c0be44a Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Wed, 5 Jun 2013 10:04:51 -0700
Subject: [PATCH] NORSPEC-238 spec map env mask term in alpha chan ignored

---
 .../app_settings/shaders/class1/deferred/materialF.glsl      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index bb8d26c9dc9..660a962108a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -492,10 +492,7 @@ void main()
 
 	vec4 final_specular = spec;
 #if HAS_SPECULAR_MAP
-	//final_color.rgb *= 1 - spec.a * env_intensity;
-	//final_specular.rgb *= specular_color.rgb;
-	
-	vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0);
+	vec4 final_normal = vec4(encode_normal(normalize(tnorm)), spec.a, 0.0);
 	final_specular.a = specular_color.a * norm.a;
 #else
 	vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0);
-- 
GitLab