diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 10:04:51 -0700 | 
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 10:04:51 -0700 | 
| commit | d50aeed8de119bb9ddcb74128bcb05fe7c0be44a (patch) | |
| tree | 0f3e4306123a8f9ec4ab7f70411289ba83c02fb3 | |
| parent | db85ed33e03c81b69ec020f6daf302bc2478163e (diff) | |
NORSPEC-238 spec map env mask term in alpha chan ignored
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 5 | 
1 files changed, 1 insertions, 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 bb8d26c9dc..660a962108 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); | 
