diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-05-31 09:29:03 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-05-31 09:29:03 -0700 |
| commit | 4d5c0fe3efa3bc60b114623180d8830125115359 (patch) | |
| tree | 8396329fb9b2447c3158e9d37ad744a2a600dd26 | |
| parent | 59275152120efd0637bbef67443b9c0d5014a321 (diff) | |
| parent | 485c5978e7559471f4dad66fb141408262d75363 (diff) | |
Merge
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 7 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index c104dc884f..f7368e8652 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -65,7 +65,12 @@ void main() float final_alpha = color.a * vertex_color.a; #ifdef HAS_ALPHA_MASK - if (color.a < minimum_alpha) + if (color.a < 0.05) + { + discard; + } + + if (minimum_alpha > 0 && color.a < minimum_alpha) { discard; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl index d79d2423f1..96e6f11b96 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl @@ -43,7 +43,8 @@ void main() { float alpha = diffuseLookup(vary_texcoord0.xy).a; - alpha *= vertex_color.a; + // SL-11051 + //alpha *= vertex_color.a; if (alpha < 0.05) // treat as totally transparent { |