diff options
author | Graham Linden <graham@lindenlab.com> | 2013-08-15 09:37:54 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-08-15 09:37:54 -0700 |
commit | dc63061714b0872a123ca769cd3683ab233c9915 (patch) | |
tree | b3de09261594c23c29b808d0eab35c763264fa1b /indra/newview | |
parent | 141c34cff46a7f2be868df45aa1a8de7b95fa4a4 (diff) |
NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking obey vertex alpha
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl index eaaa7b208d..cad5b9ff04 100755 --- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl @@ -41,13 +41,13 @@ void default_lighting() { vec4 color = diffuseLookup(vary_texcoord0.xy); + color *= vertex_color; + if (color.a < minimum_alpha) { discard; } - color.rgb *= vertex_color.rgb; - color.rgb = atmosLighting(color.rgb); color.rgb = scaleSoftClip(color.rgb); |