Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-02 13:20:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-02 13:20:03 +0300
commit7a9693fa8ba2132e09a892dfa0e60736b741002a (patch)
tree3c233bf23a355ebeec87574b92097fb0e09fea29 /source/blender/editors
parent56bcda8bc63fa8461c8abe05f1d501fd3f536f45 (diff)
Library API: pass Main struct to unlink functions
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_group.c3
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index 3c43f2729bd..76a8a68c42d 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -521,12 +521,13 @@ void OBJECT_OT_group_remove(wmOperatorType *ot)
static int group_unlink_exec(bContext *C, wmOperator *UNUSED(op))
{
+ Main *bmain = CTX_data_main(C);
Group *group = CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
if (!group)
return OPERATOR_CANCELLED;
- BKE_group_unlink(group);
+ BKE_group_unlink(bmain, group);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 863f09d4039..253430a4b13 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -215,8 +215,9 @@ static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEle
}
}
-static void unlink_group_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te),
- TreeStoreElem *tsep, TreeStoreElem *tselem)
+static void unlink_group_cb(
+ bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
+ TreeStoreElem *tsep, TreeStoreElem *tselem)
{
Group *group = (Group *)tselem->id;
@@ -227,7 +228,8 @@ static void unlink_group_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEleme
}
}
else {
- BKE_group_unlink(group);
+ Main *bmain = CTX_data_main(C);
+ BKE_group_unlink(bmain, group);
}
}