diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-05 08:07:55 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-05 08:07:55 -0700 |
| commit | 42ddf24b8e206029f3fc9a4b3c1bd7138c1a849b (patch) | |
| tree | e7566c82b11de74210fc22ee470e55ca9a7d5ed6 /indra/newview | |
| parent | a6443ce4928f2ce90630717994943252a585f764 (diff) | |
SL-11109, SL-11342, SL-11051
Fix handling of objects with object transparency by diffuse alpha mode none
and replace discard test to allow diffuse mode alpha blend objects to not falsely cast shadows.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl index 96e6f11b96..721e682029 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl @@ -43,15 +43,15 @@ void main() { float alpha = diffuseLookup(vary_texcoord0.xy).a; - // SL-11051 - //alpha *= vertex_color.a; if (alpha < 0.05) // treat as totally transparent { discard; } - if (alpha < minimum_alpha) // treat as semi-transparent + 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) { |