From 7af90c5ea01442eaa1a4d7e313def1799f6367b7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 19 Mar 2020 03:07:30 -0400
Subject: [PATCH] Revert "Unbreak Niran's face by reverting the hack in
09b13b3981f121f20674b874f47f96bef2ac73ce"
This reverts commit d67f05f9d475000cc800c18287314933da7cdd83.
---
.../app_settings/shaders/class1/deferred/materialF.glsl | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index e08663e3ce8..4198053c99e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -223,11 +223,10 @@ 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.
- // <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;
- // }
+ 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