From ad9e08b8a1c3ba34c2bb0ccaffe2e968da7b8c9a Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 15 Nov 2011 15:52:29 -0800 Subject: SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up the eyeball texture for Mac OS Lion --- indra/newview/lldrawpoolavatar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 60313b25a0..55b314fbb1 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -657,7 +657,7 @@ void LLDrawPoolAvatar::endDeferredImpostor() void LLDrawPoolAvatar::beginDeferredRigid() { sVertexProgram = &gDeferredNonIndexedDiffuseAlphaMaskNoColorProgram; - + sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); sVertexProgram->bind(); sVertexProgram->setMinimumAlpha(0.2f); } @@ -665,6 +665,7 @@ void LLDrawPoolAvatar::beginDeferredRigid() void LLDrawPoolAvatar::endDeferredRigid() { sShaderLevel = mVertexShaderLevel; + sVertexProgram->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP); sVertexProgram->unbind(); gGL.getTexUnit(0)->activate(); } -- cgit v1.2.3