diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-17 16:07:00 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-17 16:07:00 -0600 |
| commit | c05f3d384b747cfc2c732bad139e12e834507cf9 (patch) | |
| tree | e72429b25ad74b49b5c608890c0eb6574453c87c /indra/newview | |
| parent | 0ba198b94b85979bc970f2fcabf9df652d94e669 (diff) | |
| parent | cd582e3364c012aed3e87d2bd4dfacad761b015c (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index ae3421a019..fbf39ee91e 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1030,6 +1030,7 @@ void LLDrawPoolAvatar::beginDeferredSkinned() sVertexProgram->bind(); + sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); enable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]); gGL.getTexUnit(0)->activate(); @@ -1042,6 +1043,8 @@ void LLDrawPoolAvatar::endDeferredSkinned() disable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]); sVertexProgram->unbind(); + sVertexProgram->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP); + sShaderLevel = mVertexShaderLevel; gGL.getTexUnit(0)->activate(); |