From 8e7574b9ae9fb5cd6430e084ed38acb6c87a46a9 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 9 Aug 2016 00:24:28 -0500
Subject: [PATCH] Propogate correct mats shader mask for rigged alpha faces.

---
 indra/newview/llvovolume.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 874938d64..b4b94cd96 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4987,9 +4987,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 							if(te->getColor().mV[3] > 0.f)
 							{
 								U32 mask = te->getFullbright() ? LLDrawPoolAvatar::RIGGED_FULLBRIGHT_ALPHA : LLDrawPoolAvatar::RIGGED_ALPHA;
-								if (mat && LLPipeline::sRenderDeferred && te->getColor().mV[3] >= 0.999f )
+								if (mat && LLPipeline::sRenderDeferred)
 								{
-									if(mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND)
+									if(te->getColor().mV[3] < 0.999f || mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND)
 										mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND);
 									else
 										mask = mat->getShaderMask();