Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rigged mesh stack smashing

Browse Source
This commit is contained in:
Drake Arconis
2013-03-04 16:13:58 -05:00
parent 3fac86158c
commit 6e72ec2e12
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llvovolume.cpp
View File

@@ -3047,7 +3047,8 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
LLMatrix4a mp[64];
LLMatrix4* mat = (LLMatrix4*) mp;
for (U32 j = 0; j < skin->mJointNames.size(); ++j)
U32 maxJoints = llmin(skin->mJointNames.size(), 64);
for (U32 j = 0; j < maxJoints; ++j)
{
LLJoint* joint = avatar->getJoint(skin->mJointNames[j]);
if (joint)
@@ -3105,7 +3106,13 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
F32 w = wght[k];
LLMatrix4a src;
src.setMul(mp[idx[k]], w);
// Insure ref'd bone is in our clamped array of mats
llassert(idx[k] < 64);
// don't read garbage off the stack in release
if (idx[k] < 64)
{
src.setMul(mp[idx[k]], w);
}
final_mat.add(src);
}