From bd09297b8ec465a52f294092998812745ec6c566 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 3 Jun 2016 08:08:41 -0400
Subject: SL-220 - handle case that a weighted vertex includes no skin weights

---
 indra/newview/llskinningutil.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

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
-- 
cgit v1.2.3