diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
| commit | eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch) | |
| tree | 7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/llcharacter/llpose.cpp | |
| parent | db5cda26676f376f18816013c0c5e3fbad5b20d0 (diff) | |
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/llcharacter/llpose.cpp')
| -rw-r--r-- | indra/llcharacter/llpose.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp index 93255d702c..dd4880dbb9 100644 --- a/indra/llcharacter/llpose.cpp +++ b/indra/llcharacter/llpose.cpp @@ -516,9 +516,9 @@ BOOL LLPoseBlender::addMotion(LLMotion* motion) void LLPoseBlender::blendAndApply() { for (blender_list_t::iterator iter = mActiveBlenders.begin(); - iter != mActiveBlenders.end(); ++iter) + iter != mActiveBlenders.end(); ) { - LLJointStateBlender* jsbp = *iter; + LLJointStateBlender* jsbp = *iter++; jsbp->blendJointStates(); } |