From 75065e5b2f5f6fa1b2cc522ea4176eff61b3ccf4 Mon Sep 17 00:00:00 2001 From: Nate Rupsis Date: Tue, 13 Jun 2023 21:38:30 -0400 Subject: [PATCH 1/2] targeting 3.6 --- source/blender/editors/object/object_vgroup.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 576dd83cf61..2c436cde34b 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -722,7 +722,7 @@ static const EnumPropertyItem WT_vertex_group_select_item[] = { const EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(const bContext *C, PointerRNA * /*ptr*/, - PropertyRNA *prop, + PropertyRNA * /*prop*/, bool *r_free, const uint selection_mask) { @@ -760,12 +760,6 @@ 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. */ - if (ob) { - 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; @@ -2907,6 +2901,13 @@ void OBJECT_OT_vertex_group_normalize(wmOperatorType *ot) static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op) { Object *ob = ED_object_context(C); + + /* A bit of a hack to set the default group subset. If armature is present, default to `Deform + * Bones` otherwise `All Groups`. */ + RNA_enum_set(op->ptr, + "group_select_mode", + BKE_modifiers_is_deformed_by_armature(ob) ? WT_VGROUP_BONE_DEFORM : WT_VGROUP_ALL); + bool lock_active = RNA_boolean_get(op->ptr, "lock_active"); eVGroupSelect subset_type = static_cast( RNA_enum_get(op->ptr, "group_select_mode")); -- 2.30.2 From 2b7579c5f582aad42fe6ae929c4e888f6fbb9303 Mon Sep 17 00:00:00 2001 From: Nate Rupsis Date: Thu, 15 Jun 2023 09:33:40 -0400 Subject: [PATCH 2/2] comment cleanup --- source/blender/editors/object/object_vgroup.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 2c436cde34b..9a90d37263e 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -2902,8 +2902,7 @@ static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op) { Object *ob = ED_object_context(C); - /* A bit of a hack to set the default group subset. If armature is present, default to `Deform - * Bones` otherwise `All Groups`. */ + /* If armature is present, default to `Deform Bones` otherwise `All Groups`. */ RNA_enum_set(op->ptr, "group_select_mode", BKE_modifiers_is_deformed_by_armature(ob) ? WT_VGROUP_BONE_DEFORM : WT_VGROUP_ALL); -- 2.30.2