From a6585fa4b1a7a4dd4b5ea21efcee36c8460ff5ec Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 12 Jun 2018 15:16:45 +0200 Subject: Cleanup: moar removal of G.main in BKE area... --- source/blender/editors/object/object_group.c | 24 +++++++++++++----------- source/blender/editors/object/object_relations.c | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/object') diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index e5accee171a..c764ee22162 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -65,6 +65,7 @@ /* can be called with C == NULL */ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) { + Main *bmain = CTX_data_main(C); Object *ob; EnumPropertyItem *item = NULL, item_tmp = {0}; int totitem = 0; @@ -82,7 +83,7 @@ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA /* if 2 or more groups, add option to add to all groups */ group = NULL; - while ((group = BKE_group_object_find(group, ob))) + while ((group = BKE_group_object_find(bmain, group, ob))) count++; if (count >= 2) { @@ -94,7 +95,7 @@ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA /* add groups */ group = NULL; - while ((group = BKE_group_object_find(group, ob))) { + while ((group = BKE_group_object_find(bmain, group, ob))) { item_tmp.identifier = item_tmp.name = group->id.name + 2; /* item_tmp.icon = ICON_ARMATURE_DATA; */ item_tmp.value = i; @@ -110,11 +111,11 @@ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA } /* get the group back from the enum index, quite awkward and UI specific */ -static Group *group_object_active_find_index(Object *ob, const int group_object_index) +static Group *group_object_active_find_index(Main *bmain, Object *ob, const int group_object_index) { Group *group = NULL; int i = 0; - while ((group = BKE_group_object_find(group, ob))) { + while ((group = BKE_group_object_find(bmain, group, ob))) { if (i == group_object_index) { break; } @@ -130,7 +131,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); int single_group_index = RNA_enum_get(op->ptr, "group"); - Group *single_group = group_object_active_find_index(ob, single_group_index); + Group *single_group = group_object_active_find_index(bmain, ob, single_group_index); Group *group; bool is_cycle = false; bool updated = false; @@ -203,7 +204,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *ob = OBACT; int single_group_index = RNA_enum_get(op->ptr, "group"); - Group *single_group = group_object_active_find_index(ob, single_group_index); + Group *single_group = group_object_active_find_index(bmain, ob, single_group_index); Group *group; bool ok = false; @@ -221,7 +222,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op) /* Remove groups from selected objects */ CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { - BKE_group_object_unlink(group, base->object, scene, base); + BKE_group_object_unlink(bmain, group, base->object, scene, base); ok = 1; } CTX_DATA_END; @@ -268,7 +269,7 @@ static int group_objects_remove_all_exec(bContext *C, wmOperator *UNUSED(op)) CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { - BKE_object_groups_clear(scene, base, base->object); + BKE_object_groups_clear(bmain, scene, base, base->object); } CTX_DATA_END; @@ -299,7 +300,7 @@ static int group_objects_remove_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); int single_group_index = RNA_enum_get(op->ptr, "group"); - Group *single_group = group_object_active_find_index(ob, single_group_index); + Group *single_group = group_object_active_find_index(bmain, ob, single_group_index); Group *group; bool updated = false; @@ -315,7 +316,7 @@ static int group_objects_remove_exec(bContext *C, wmOperator *op) /* now remove all selected objects from the group */ CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { - BKE_group_object_unlink(group, base->object, scene, base); + BKE_group_object_unlink(bmain, group, base->object, scene, base); updated = true; } CTX_DATA_END; @@ -490,6 +491,7 @@ void OBJECT_OT_group_link(wmOperatorType *ot) static int group_remove_exec(bContext *C, wmOperator *UNUSED(op)) { + Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); Object *ob = ED_object_context(C); Group *group = CTX_data_pointer_get_type(C, "group", &RNA_Group).data; @@ -497,7 +499,7 @@ static int group_remove_exec(bContext *C, wmOperator *UNUSED(op)) if (!ob || !group) return OPERATOR_CANCELLED; - BKE_group_object_unlink(group, ob, scene, NULL); /* base will be used if found */ + BKE_group_object_unlink(bmain, group, ob, scene, NULL); /* base will be used if found */ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 727b7d69723..15939f80535 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1550,7 +1550,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op) /* avoid searching all groups in source object each time */ if (type == MAKE_LINKS_GROUP) { - ob_groups = BKE_object_groups(ob_src); + ob_groups = BKE_object_groups(bmain, ob_src); } CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases) @@ -1598,7 +1598,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op) LinkNode *group_node; /* first clear groups */ - BKE_object_groups_clear(scene, base_dst, ob_dst); + BKE_object_groups_clear(bmain, scene, base_dst, ob_dst); /* now add in the groups from the link nodes */ for (group_node = ob_groups; group_node; group_node = group_node->next) { -- cgit v1.2.3