From d67f05f9d475000cc800c18287314933da7cdd83 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 14 Mar 2020 14:30:01 -0400
Subject: [PATCH] Unbreak Niran's face by reverting the hack in
09b13b3981f121f20674b874f47f96bef2ac73ce
---
.../app_settings/shaders/class1/deferred/materialF.glsl | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index a8a5cc22dba..a02476688f0 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -223,10 +223,11 @@ void main()
// fully opaque and for fully transparent objects. This code assumes the 0 alpha
// is always from the opaque end of the scale. TODO: Remove the conditional once
// the root cause of the slider ambiguity is fixed.
- if (vertex_color.a > 0.0)
- {
- diffuse_srgb.a *= vertex_color.a;
- }
+ // <Alchemy:Rye>: This broke alpha masked material content. REVERT UNTIL THEY FIX IT.
+ // if (vertex_color.a > 0.0)
+ // {
+ // diffuse_srgb.a *= vertex_color.a;
+ // }
vec4 diffuse_linear = vec4(srgb_to_linear(diffuse_srgb.rgb), diffuse_srgb.a);
#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_MASK)
--
GitLab