diff options
author | Pavel Krivich <pavelkproductengine@lindenlab.com> | 2016-12-12 19:20:43 +0200 |
---|---|---|
committer | Pavel Krivich <pavelkproductengine@lindenlab.com> | 2016-12-12 19:20:43 +0200 |
commit | 597a68ebbf274bb2186df4c069b47f3064973dc8 (patch) | |
tree | 79b330b2409852813d0e40caf9644f0ecafdfae9 /indra/newview | |
parent | 5cc716dbf9470f7be454588b5402408bafa225bb (diff) | |
parent | ef7ddc9407bfd4d19aeb73a61f1b7a077879c70a (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/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl | 4 |
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); |