summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-04-08 21:09:29 -0400
committerGeenz <geenz@geenzo.com>2013-04-08 21:09:29 -0400
commit3f01526e7120724e56f073e199bdc365f3f4b8db (patch)
treedd6a85619aed3fa1a8ebe1f6f0b3c24f7b5f825a /indra
parent1741d82a1d1c057009558dc772cdecf5989c4d3f (diff)
Fix for specular exponents not being applied appropriately from the normal map alpha.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index e406bf14a9..de404cbffe 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -110,10 +110,10 @@ void main()
final_specular.rgb *= specular_color.rgb;
vec4 final_normal = vec4(normalize(tnorm), spec.a * env_intensity);
- final_specular.a = specular_color.a * spec.a;
+ final_specular.a = specular_color.a * norm.a;
#else
vec4 final_normal = vec4(normalize(tnorm), 0.0);
- final_specular.a = spec.a;
+ final_specular.a = specular_color.a;
#endif
final_normal.xyz = final_normal.xyz * 0.5 + 0.5;