From 124c5cf4a781e50f81e7266a1af5f83b36777651 Mon Sep 17 00:00:00 2001
From: "Michael Pohoreski (Ptolemy Linden)" <ptolemy@lindenlab.com>
Date: Tue, 17 Dec 2019 23:34:54 +0000
Subject: SL-12472 to address SL-11406
---
.../app_settings/shaders/class1/deferred/materialF.glsl | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
(limited to 'indra')
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;
--
cgit v1.2.3