summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-12-01 16:21:52 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-12-01 16:21:52 -0500
commitfe5ff3e74a69bb7ede65d7d5865325c0a771eca6 (patch)
treefbc52c83af483daaa9586aaa8ec6527a478a2cdb /indra/newview/lldrawpoolavatar.cpp
parent38a258d04a98939e12bb2cfce6caea288a7fc3a5 (diff)
parentd960676c5af26b299166bdd74744a7f513b45541 (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rwxr-xr-xindra/newview/lldrawpoolavatar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index afd5b84537..ab96201a63 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];
}