From 20e5ad48ec1a9c6fa4902fa34b6b53f0a7fc5858 Mon Sep 17 00:00:00 2001
From: Runitai Linden <davep@lindenlab.com>
Date: Tue, 24 Mar 2020 13:44:40 -0500
Subject: Merge cleanup

---
 indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders')

diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 4644fe3f2b..2999abacef 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -223,7 +223,7 @@ void main()
 
     // Comparing floats cast from 8-bit values, produces acne right at the 8-bit transition points
     float bias = 0.001953125; // 1/512, or half an 8-bit quantization
-    if (diffuse_linear.a < minimum_alpha-bias)
+    if (diffcol.a < minimum_alpha-bias)
     {
         discard;
     }
-- 
cgit v1.2.3