summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-12-09 19:31:30 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-12-09 19:31:30 +0200
commitef7ddc9407bfd4d19aeb73a61f1b7a077879c70a (patch)
tree816efe6c27345f000e2ac6d7c6c5c013a6a4d354 /indra
parentabbf5ff4b95ba4711f9ba6352650ce5e23f4c1e0 (diff)
MAINT-6551 One of my avatars does not render correctly when ALM is disabled unless basic shaders are also disabled.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl4
1 files 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 b9ddbc8e1c..8918182853 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);