From ef7ddc9407bfd4d19aeb73a61f1b7a077879c70a Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 9 Dec 2016 19:31:30 +0200
Subject: [PATCH] MAINT-6551 One of my avatars does not render correctly when
 ALM is disabled unless basic shaders are also disabled.

---
 .../shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
index b9ddbc8e1ce..89181828536 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
@@ -43,12 +43,12 @@ void default_lighting()
 {
 	vec4 color = texture2D(diffuseMap,vary_texcoord0.xy);
 
+	color *= vertex_color;
+
 	if (color.a < minimum_alpha)
 	{
 		discard;
 	}
-
-	color.rgb *= vertex_color.rgb;
 	
 	color.rgb = atmosLighting(color.rgb);
 
-- 
GitLab