From 440a40c8f9fd35577470aee193a4b7dd128d80bb Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 22 Aug 2019 10:41:55 -0700 Subject: SL-11406 Restore code to stomp emissive in the absence of a normal map (to avoid fullbright implying full emissive). --- indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/app_settings/shaders/class1') 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 -- cgit v1.2.3