diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-17 16:06:34 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-17 16:06:34 -0600 |
| commit | cd582e3364c012aed3e87d2bd4dfacad761b015c (patch) | |
| tree | f5d4db1301a18288e7a8d26de2245dd170298dd2 | |
| parent | 8bbbcd9c22010a259d42d23c517e04fe7afd41fd (diff) | |
SH-547 Use appropriate texture channel for rendering avatars into their impostor map.
| -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(); |