diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
| commit | dab5acd972c05b4c9d23d5dfb46afe9eff6c9567 (patch) | |
| tree | 6f3b1ca79eefbc2b232a5da809359eefcf59ecfb /indra/newview/lldrawpoolavatar.cpp | |
| parent | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-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 393bd70382..ef121cd910 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1624,7 +1624,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]; } |