fix [#29431] "Normalize All" from Weight Tools don't work correctly

[blender.git] / source / blender / blenkernel / intern / deform.c

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index aef9543a8e2376cb70498f6c0e59ea293bd6ac3e..4110d4565b2319936c994efdfd2c98ee167e468f 100644 (file)
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <math.h>
 #include <ctype.h>
 #include <string.h>
 #include <math.h>
 #include <ctype.h>

+#include <stdlib.h>

 
 #include "MEM_guardedalloc.h"
 
 
 #include "MEM_guardedalloc.h"
 


@@ -41,7 +42,10 @@
 
 #include "BKE_deform.h"
 
 
 #include "BKE_deform.h"
 

-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"

 #include "BLI_utildefines.h"
 
 
 #include "BLI_utildefines.h"
 
 


@@ -204,7 +208,7 @@ void defvert_normalize(MDeformVert *dvert)
        }
 }
 
        }
 }
 

-void defvert_normalize_lock(MDeformVert *dvert, const int def_nr_lock)
+void defvert_normalize_lock_single(MDeformVert *dvert, const int def_nr_lock)

 {
        if (dvert->totweight <= 0) {
                /* nothing */
 {
        if (dvert->totweight <= 0) {
                /* nothing */


@@ -248,6 +252,50 @@ void defvert_normalize_lock(MDeformVert *dvert, const int def_nr_lock)
        }
 }
 
        }
 }
 

+void defvert_normalize_lock_map(MDeformVert *dvert, const char *lock_flags, const int defbase_tot)
+{
+       if (dvert->totweight <= 0) {
+               /* nothing */
+       }
+       else if (dvert->totweight == 1) {
+               if (LIKELY(defbase_tot >= 1) && lock_flags[0]) {
+                       dvert->dw[0].weight = 1.0f;
+               }
+       }
+       else {
+               MDeformWeight *dw;
+               unsigned int i;
+               float tot_weight = 0.0f;
+               float lock_iweight = 0.0f;
+
+               for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+                       if ((dw->def_nr < defbase_tot) && (lock_flags[dw->def_nr] == FALSE)) {
+                               tot_weight += dw->weight;
+                       }
+                       else {
+                               /* invert after */
+                               lock_iweight += dw->weight;
+                       }
+               }
+
+               lock_iweight = maxf(0.0f, 1.0f - lock_iweight);
+
+               if (tot_weight > 0.0f) {
+                       /* paranoid, should be 1.0 but in case of float error clamp anyway */
+
+                       float scalar = (1.0f / tot_weight) * lock_iweight;
+                       for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+                               if ((dw->def_nr < defbase_tot) && (lock_flags[dw->def_nr] == FALSE)) {
+                                       dw->weight *= scalar;
+
+                                       /* in case of division errors with very low weights */
+                                       CLAMP(dw->weight, 0.0f, 1.0f);
+                               }
+                       }
+               }
+       }
+}
+

 void defvert_flip(MDeformVert *dvert, const int *flip_map, const int flip_map_len)
 {
        MDeformWeight *dw;
 void defvert_flip(MDeformVert *dvert, const int *flip_map, const int flip_map_len)
 {
        MDeformWeight *dw;