diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-15 00:05:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-15 00:05:08 -0500 |
| commit | 492499e7156194f74022d24106145762865fd41f (patch) | |
| tree | feb27b17d0d823bf6325c341d1cee840b7ae7d56 /indra/newview/lldrawpoolavatar.cpp | |
| parent | d3d180f5db0350d6a8b930227b17d5001e673295 (diff) | |
| parent | 54dd30cc426e16aa99b4f7eea080bbeae0656843 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -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 2cd9fef9f5..7ab85ae3e4 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -323,7 +323,7 @@ void LLDrawPoolAvatar::renderShadow(S32 pass) S32 LLDrawPoolAvatar::getNumPasses() { - return LLPipeline::sImpostorRender ? 1 : 3; + return LLPipeline::sImpostorRender ? 1 : 4; } void LLDrawPoolAvatar::render(S32 pass) @@ -586,6 +586,7 @@ void LLDrawPoolAvatar::beginRigged() void LLDrawPoolAvatar::endRigged() { sVertexProgram = NULL; + LLVertexBuffer::unbind(); gSkinnedObjectSimpleProgram.unbind(); LLVertexBuffer::sWeight4Loc = -1; } |