diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 14:56:12 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 14:56:12 -0400 |
| commit | fe89d4c5c2f5779d43d41760600e14925e517b3d (patch) | |
| tree | 011de495f587aa044620f4312ac8b7bdc4a651bc /indra | |
| parent | 8a6bfb0e2213151341a25dfc4b411c2718fc64a6 (diff) | |
| parent | d0eed685023fca913e643d3e90e97e5dc6914a99 (diff) | |
merge
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index e1d3d1a905..0bbf7db46e 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1600,6 +1600,14 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* for (U32 j = 0; j < count; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); + if (!joint) + { + joint = avatar->getJoint("mPelvis"); + } + if (!joint) + { + LL_DEBUGS("Avatar") << "Failed to find " << skin->mJointNames[j] << LL_ENDL; + } if (joint) { mat[j] = skin->mInvBindMatrix[j]; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 0432f6f27c..267061b83d 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4172,6 +4172,10 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons for (U32 j = 0; j < maxJoints; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); + if (!joint) + { + joint = avatar->getJoint("mPelvis"); + } if (joint) { mat[j] = skin->mInvBindMatrix[j]; |