diff options
author | andreykproductengine <akleshchev@productengine.com> | 2014-12-02 16:34:07 +0200 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2014-12-02 16:34:07 +0200 |
commit | fa9077262d4935fec09339e0e917b7faeddb6ebe (patch) | |
tree | af3cb3510debaa309ae63c09bb4a14ed12891a3a /indra/newview/lldrawpoolavatar.cpp | |
parent | bec06763d5e55dde5148ee8882c04ddfee9dd859 (diff) | |
parent | d960676c5af26b299166bdd74744a7f513b45541 (diff) |
merge changes for 3.7.21-release
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rwxr-xr-x | 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 90e6dfe351..e7420f32f0 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1626,7 +1626,8 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* { F32 w = weight[j][k]; - idx[k] = llclamp((S32) floorf(w), 0, 63); + idx[k] = llclamp((S32) floorf(w), 0, JOINT_COUNT-1); + wght[k] = w - floorf(w); scale += wght[k]; } |