From c2785a740eb98d28ba705c981f4b6b289501d2e5 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Fri, 15 Feb 2013 11:49:59 -0500
Subject: Fixed: alpha mode shaders not being bound appropriately.

---
 indra/newview/lldrawpoolmaterials.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lldrawpoolmaterials.cpp')

diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp
index e775346563..52f476f589 100644
--- a/indra/newview/lldrawpoolmaterials.cpp
+++ b/indra/newview/lldrawpoolmaterials.cpp
@@ -68,20 +68,23 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass)
 		switch (params.mDiffuseAlphaMode)
 		{
 			case 0:
-				LL_INFOS("Asdf") << "Renderererererrerererrrr!!!~!!!~!~" << LL_ENDL;
 				mShader = &gDeferredMaterialShinyNormal;
+				mShader->bind();
 				break;
 			case 1: // Alpha blending not supported in the opaque draw pool.
 				return;
 			case 2:
 				mShader = &gDeferredMaterialShinyNormalAlphaTest;
+				mShader->bind();
+				mShader->setMinimumAlpha(params.mAlphaMaskCutoff);
 				break;
 			case 3:
 				mShader = &gDeferredMaterialShinyNormalEmissive;
+				mShader->bind();
 				break;
 		};
 		
-		mShader->bind();
+		
 		
 		mShader->uniform4f(LLShaderMgr::SPECULAR_COLOR, params.mSpecColor.mV[0], params.mSpecColor.mV[1], params.mSpecColor.mV[2], params.mSpecColor.mV[3]);
 		mShader->uniform1f(LLShaderMgr::ENVIRONMENT_INTENSITY, params.mEnvIntensity);
-- 
cgit v1.3