diff options
author | Michael Pohoreski (Ptolemy Linden) <ptolemy@lindenlab.com> | 2019-12-17 23:34:54 +0000 |
---|---|---|
committer | Michael Pohoreski (Ptolemy Linden) <ptolemy@lindenlab.com> | 2019-12-17 23:34:54 +0000 |
commit | 124c5cf4a781e50f81e7266a1af5f83b36777651 (patch) | |
tree | 60cf501db4ef94d54a41dc574eca874e05cfbe3b /indra/newview/app_settings/shaders/class1 | |
parent | 05e54ac96be519e5f60f2681ac3226dab7dcb8b2 (diff) |
SL-12472 to address SL-11406
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 52c69b46ea..2b5fa3979b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -277,7 +277,7 @@ void main() final_color.a = max(final_color.a, emissive_brightness); // Texture - // [x] Full Bright Object + // [x] Full Bright (emissive_brightness > 0.0) // Shininess (specular) // [X] Texture // Environment Intensity = 1 @@ -292,11 +292,14 @@ void main() // We remap the environment intensity to closely simulate what non-EEP is doing. // At midnight the brightness is exact. // At midday the brightness is very close. -#ifdef HAS_SKIN vec4 final_normal = vec4(abnormal, env_intensity, 0.0); -#else - float ei = env_intensity*0.5 + 0.5; - vec4 final_normal = vec4(abnormal, ei, 0.0); + +#ifdef HAS_SPECULAR_MAP + if( emissive_brightness > 0.0) + { + float ei = env_intensity*0.5 + 0.5; + final_normal = vec4(abnormal, ei, 0.0); + } #endif vec4 final_specular = spec; |