summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRunitai Linden <davep@lindenlab.com>2020-03-24 13:44:40 -0500
committerRunitai Linden <davep@lindenlab.com>2020-03-24 13:44:40 -0500
commit20e5ad48ec1a9c6fa4902fa34b6b53f0a7fc5858 (patch)
treeb6c2b768479a16a61cba010fbaeab223dfc0b307 /indra/newview/app_settings
parentcbe83442790927349d5d7a374c80185d761c1f41 (diff)
Merge cleanup
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl2
1 files changed, 1 insertions, 1 deletions
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;
}