summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-08-22 10:41:55 -0700
committerGraham Linden <graham@lindenlab.com>2019-08-22 10:41:55 -0700
commit440a40c8f9fd35577470aee193a4b7dd128d80bb (patch)
tree14a1d1e869bbd3455f8735f0ca858d26e36212f0 /indra/newview/app_settings
parent01e6839f21becca6ade3fe723cebc26a7f10de8e (diff)
SL-11406
Restore code to stomp emissive in the absence of a normal map (to avoid fullbright implying full emissive).
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index a13c8de43e..023172c844 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -276,6 +276,10 @@ void main()
#endif
final_color.a = max(final_color.a, emissive_brightness);
+#if !defined(HAS_NORMAL_MAP)
+ final_color.a = 0.0f;
+#endif
+
vec4 final_specular = spec;
final_specular.a = specular_color.a;
#ifdef HAS_SPECULAR_MAP