diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 18:33:38 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 18:33:38 -0500 |
commit | 7c2915518978884823e74f8d4d29a1a3073eb39c (patch) | |
tree | 75200b0eaa7d651dfa912d7babaaa87b427a8137 /indra/newview/lldrawpoolavatar.cpp | |
parent | 909c18ea978059976a25222b446ffaa426147627 (diff) | |
parent | d960676c5af26b299166bdd74744a7f513b45541 (diff) |
merge
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]; } |