griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #107920: Weight gradient tool auto normalizes over locked groups

Browse Source 
Locking wasnt respected, now use `BKE_defvert_normalize_lock_map`
instead (and only use `BKE_defvert_normalize_lock_single` in case no
groups are locked).

Pull Request: https://projects.blender.org/blender/blender/pulls/113853
This commit is contained in:
Philipp Oeser
2023-10-20 14:14:49 +02:00
committed by Philipp Oeser
parent 09e6ebb5f0
commit 3cb659faa8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc
View File

@@ -849,12 +849,19 @@ static int paint_weight_gradient_exec(bContext *C, wmOperator *op)
if (scene->toolsettings->auto_normalize) {
const int vgroup_num = BLI_listbase_count(&me->vertex_group_names);
bool *lock_flags = BKE_object_defgroup_lock_flags_get(ob, vgroup_num);
bool *vgroup_validmap = BKE_object_defgroup_validmap_get(ob, vgroup_num);
if (vgroup_validmap != nullptr) {
MDeformVert *dvert = dverts;
for (int i = 0; i < me->totvert; i++) {
if ((data.vert_cache->elem[i].flag & WPGradient_vertStore::VGRAD_STORE_IS_MODIFIED) != 0) {
BKE_defvert_normalize_lock_single(&dvert[i], vgroup_validmap, vgroup_num, data.def_nr);
if (lock_flags != nullptr) {
BKE_defvert_normalize_lock_map(
&dvert[i], vgroup_validmap, vgroup_num, lock_flags, vgroup_num);
}
else {
BKE_defvert_normalize_lock_single(&dvert[i], vgroup_validmap, vgroup_num, data.def_nr);
}
}
}
MEM_freeN(vgroup_validmap);