[Bf-blender-cvs] [9ad0b7f8c74] blender-v2.82-release: Fix T68480: Normalize All weights with lock Active bug

Sybren A. Stüvel noreply at git.blender.org
Tue Jan 14 15:14:26 CET 2020


Commit: 9ad0b7f8c74174a21a4372b09888692c381984e0
Author: Sybren A. Stüvel
Date:   Tue Jan 14 15:13:19 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB9ad0b7f8c74174a21a4372b09888692c381984e0

Fix T68480: Normalize All weights with lock Active bug

The original code had 0 as a magic number in the test whether the weight
belongs to a locked group, instead of comparing it to the actual group
number.

Thanks @mano-wii for providing the diff.

===================================================================

M	source/blender/blenkernel/intern/deform.c

===================================================================

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index a964cab3fa5..79dcdd15bf7 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -345,7 +345,7 @@ void defvert_normalize_lock_single(MDeformVert *dvert,
   else if (dvert->totweight == 1) {
     MDeformWeight *dw = dvert->dw;
     if ((dw->def_nr < vgroup_tot) && vgroup_subset[dw->def_nr]) {
-      if (def_nr_lock != 0) {
+      if (def_nr_lock != dw->def_nr) {
         dw->weight = 1.0f;
       }
     }



More information about the Bf-blender-cvs mailing list