diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-15 15:52:29 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-15 15:52:29 -0800 |
| commit | ad9e08b8a1c3ba34c2bb0ccaffe2e968da7b8c9a (patch) | |
| tree | c213f419dab73cd03e6863e7af02bdc9d48b5cea | |
| parent | cfb666e9d9eb8945a79e2f7999459267caca36ee (diff) | |
SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up the eyeball texture for Mac OS Lion
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |