summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-05 10:08:10 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-05 10:08:10 -0700
commit8d4864750e151a2807c78c644eb5af832a869565 (patch)
tree470dd47c9923f92503da77cbe6b8e6e16bded25a /indra/newview/app_settings/shaders/class1/deferred
parent2996f34e861ab2d671df5625f26d88920e679e98 (diff)
NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or damped by glossiness
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 660a962108..9b2d308824 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -492,7 +492,7 @@ void main()
vec4 final_specular = spec;
#if HAS_SPECULAR_MAP
- vec4 final_normal = vec4(encode_normal(normalize(tnorm)), spec.a, 0.0);
+ vec4 final_normal = vec4(encode_normal(normalize(tnorm)), min(spec.a, env_intensity), 0.0);
final_specular.a = specular_color.a * norm.a;
#else
vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0);