diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-01 15:05:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-01 15:05:42 -0500 |
| commit | b811b22c4aad589d5428f9d5fa5b43c60840b039 (patch) | |
| tree | 1c0869ad65d6e2be6c34c3a756c2d70affef065c /indra/newview/lldrawpoolavatar.cpp | |
| parent | f135fd6f14eabfc08710b5099d1be7aa7a952873 (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]; } |