From b138ca8aeec421f6e5b1412e7c7fbcefd87570d0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 6 Apr 2016 16:12:39 -0400
Subject: SL-366 - more cases where skinned weights can go awry, and a bunch
 more asserts to verify.

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

(limited to 'indra/newview/llskinningutil.cpp')

diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index fbe45c8ea6..732afdfa9a 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -291,12 +291,15 @@ void LLSkinningUtil::checkSkinWeights(LLVector4a* weights, U32 num_vertices, con
         {
             F32 *w = weights[j].getF32ptr();
             
+            F32 wsum = 0.0;
             for (U32 k=0; k<4; ++k)
             {
                 S32 i = llfloor(w[k]);
                 llassert(i>=0);
                 llassert(i<max_joints);
+                wsum += w[k]-i;
             }
+            llassert(wsum > 0.0f);
         }
     }
 #endif
@@ -310,7 +313,7 @@ void LLSkinningUtil::getPerVertexSkinMatrix(
     LLMatrix4a& final_mat,
     U32 max_joints)
 {
-
+    bool valid_weights = true;
     final_mat.clear();
 
     S32 idx[4];
@@ -336,6 +339,7 @@ void LLSkinningUtil::getPerVertexSkinMatrix(
     if (handle_bad_scale && scale <= 0.f)
     {
         wght = LLVector4(1.0f, 0.0f, 0.0f, 0.0f);
+        valid_weights = false;
     }
     else
     {
@@ -353,5 +357,8 @@ void LLSkinningUtil::getPerVertexSkinMatrix(
 
         final_mat.add(src);
     }
+    // SL-366 - with weight validation/cleanup code, it should no longer be
+    // possible to hit the bad scale case.
+    llassert(valid_weights);
 }
 
-- 
cgit v1.2.3