diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-10-29 17:46:33 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-10-29 17:46:33 -0600 |
commit | 3dfdb2f6e8be4fb2a08102847520585dc1d8fd7d (patch) | |
tree | 42dcdc5941aac54ea73e263b448df10de886ce6c /indra/newview | |
parent | 2904172d719cc85bf820ef7bc9739185148a4a42 (diff) |
SL-10449 FIX [EEP] Fixed a (Mac-only) shader regression in changeset 41246
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index fafecd57cc..9505f2eb74 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -277,13 +277,13 @@ void main() final_color.a = max(final_color.a, emissive_brightness); - vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0); + vec4 final_normal = vec4(abnormal, env_intensity, 0.0); vec4 final_specular = spec; final_specular.a = specular_color.a; -#if HAS_SPECULAR_MAP - final_specular.a *= norm.a; +#ifdef HAS_SPECULAR_MAP + final_specular.a *= norm.a; final_normal.z *= spec.a; #endif |