diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-06-03 08:08:41 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-06-03 08:08:41 -0400 |
| commit | bd09297b8ec465a52f294092998812745ec6c566 (patch) | |
| tree | 8e5b4b5d6e0a8b8ddc8f6f8232dc6a5ff03a3618 /indra/newview | |
| parent | 32d28317d4c88013974fa0551fae01bc332fae4a (diff) | |
SL-220 - handle case that a weighted vertex includes no skin weights
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index 732afdfa9a..b36bfc870f 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -262,6 +262,7 @@ void LLSkinningUtil::initSkinningMatrixPalette( // static void LLSkinningUtil::remapSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin) { + checkSkinWeights(weights, num_vertices, skin); llassert(skin->mJointRemap.size()>0); // Must call remapSkinInfoJoints() first, which this checks for. const U32* remap = &skin->mJointRemap[0]; const S32 max_joints = skin->mJointRemap.size(); @@ -277,6 +278,7 @@ void LLSkinningUtil::remapSkinWeights(LLVector4a* weights, U32 num_vertices, con w[k] = remap[i] + f; } } + checkSkinWeights(weights, num_vertices, skin); } // static |