From 42ddf24b8e206029f3fc9a4b3c1bd7138c1a849b Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 5 Jun 2019 08:07:55 -0700 Subject: 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. --- .../app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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) { -- cgit v1.2.3