[Bf-blender-cvs] [0f22b5599a0] master: Normalize Weights: use valid default Subset for current context

Nate Rupsis noreply at git.blender.org
Thu Jun 30 13:01:26 CEST 2022


Commit: 0f22b5599a03d5ce61450528c74ad2f2e47cf913
Author: Nate Rupsis
Date:   Thu Jun 30 12:53:56 2022 +0200
Branches: master
https://developer.blender.org/rB0f22b5599a03d5ce61450528c74ad2f2e47cf913

Normalize Weights: use valid default Subset for current context

For the Normalize Weights operator, dynamically set the default 'Subset'
parameter so that it is applicable to the current context.

When the user's last use of Normalize Weights was set to "Deform Pose
Bones", and then tries to use the operator on a mesh without armature,
Blender would try to use the previous opertor properties and show an
error message. This is resolved by switching to `WT_VGROUP_ACTIVE` in
such cases.

Reviewed By: zanqdo, sybren

Maniphest Tasks: T95038

Differential Revision: https://developer.blender.org/D14961

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

M	source/blender/editors/object/object_vgroup.c

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

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 9ad36cacc7d..88b27bd4cea 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -693,7 +693,7 @@ static const EnumPropertyItem WT_vertex_group_select_item[] = {
 
 const EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(const bContext *C,
                                                                 PointerRNA *UNUSED(ptr),
-                                                                PropertyRNA *UNUSED(prop),
+                                                                PropertyRNA *prop,
                                                                 bool *r_free,
                                                                 const uint selection_mask)
 {
@@ -731,6 +731,10 @@ const EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(const bContext *
     RNA_enum_items_add_value(&item, &totitem, WT_vertex_group_select_item, WT_VGROUP_ALL);
   }
 
+  /* Set `Deform Bone` as default selection if armature is present. */
+  RNA_def_property_enum_default(
+    prop, BKE_modifiers_is_deformed_by_armature(ob) ? WT_VGROUP_BONE_DEFORM : WT_VGROUP_ALL);
+
   RNA_enum_item_end(&item, &totitem);
   *r_free = true;



More information about the Bf-blender-cvs mailing list