diff options
author | Graham Linden <graham@lindenlab.com> | 2019-06-18 11:25:55 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-06-18 11:25:55 -0700 |
commit | e7ac7d766d1c817ad43d5bf0b5bba7f07495395b (patch) | |
tree | 823d1d9be53c5e576aa606fedf277562b735f200 /indra/newview | |
parent | 032848472c1895040d5323948fc67e8f47c5fad3 (diff) |
SL-11109
Move vert alpha multiply back before discard tests to fix object transparency only object shadow casting.
Very likely re-breaks SL_11051 making fullbright alpha mask objects not cast when they should (due to broken vertex alpha...).
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl index 80b096fd97..b2fbd8b86c 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl @@ -43,6 +43,8 @@ void main() { float alpha = diffuseLookup(vary_texcoord0.xy).a; + alpha *= vertex_color.a; + // mask cutoff 0 -> no shadow SL-11051 if (minimum_alpha == 0) { @@ -54,8 +56,6 @@ void main() discard; } - alpha *= vertex_color.a; - if (alpha < 0.88) // treat as semi-transparent { if (fract(0.5*floor(target_pos_x / post_pos.w )) < 0.25) |