diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 14:27:15 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 14:27:15 -0800 |
| commit | fbaedeaf6d28cc3d7fb1a6f8b03d846a29f00251 (patch) | |
| tree | 2539293ffee576c8bcb46bcc10574e892007b0a6 | |
| parent | 03c738d0c9df57a786803a292bc766e78d014749 (diff) | |
| parent | aa246374cc513f264ea620521a6df8e430a646f3 (diff) | |
merge
| -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(); |