From a471ddd0be09a7bd6815c09a98fc7acd87feac58 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Fri, 10 Jan 2020 17:26:54 -0800
Subject: [PATCH] SL-12171: Fix for SL-12006 that made non-emissive portions of
textures too dim.
---
.../newview/app_settings/shaders/class1/deferred/materialF.glsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index f4e041eb5c7..8ed5713e227 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -272,7 +272,7 @@ void main()
#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_EMISSIVE)
final_color.a = diffuse_linear.a;
- final_color.rgb *= 0.5;
+ final_color.rgb = mix( diffuse_linear.rgb, final_color.rgb*0.5, diffuse_tap.a ); // SL-12171: Fix emissive texture portion being twice as bright.
#endif
final_color.a = max(final_color.a, emissive_brightness);
--
GitLab