summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-09-01 17:18:16 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-09-01 17:18:16 -0600
commit38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (patch)
treec44c6003e4438e38af12f78cb580a3ba9d951f9f /indra/newview/lldrawpoolavatar.cpp
parent7ee10ae1def26708fa44c25355982aa56195d5f9 (diff)
for SH-2242: fixes the assertion caused by gGL.diffuseColor4f when shadows is on.
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index f0eb52909d..96c4efde3d 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -353,15 +353,15 @@ void LLDrawPoolAvatar::beginShadowPass(S32 pass)
{
sVertexProgram = &gDeferredAvatarShadowProgram;
- //gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.2f);
-
- gGL.diffuseColor4f(1,1,1,1);
+ //gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.2f);
if ((sShaderLevel > 0)) // for hardware blending
{
sRenderingSkinned = TRUE;
sVertexProgram->bind();
}
+
+ gGL.diffuseColor4f(1,1,1,1);
}
else
{