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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-12 16:16:45 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-12 16:16:45 +0300
commita6585fa4b1a7a4dd4b5ea21efcee36c8460ff5ec (patch)
tree1767ffcbd73592950909c2c0cdb3816700453553 /source/blender/blenkernel/intern/object.c
parentd617a6c85b4874a81d86568d00b56f2bda11c4b4 (diff)
Cleanup: moar removal of G.main in BKE area...
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 9178b889062..1944b01827b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3384,18 +3384,18 @@ LinkNode *BKE_object_relational_superset(struct Scene *scene, eObjectSet objectS
/**
* return all groups this object is apart of, caller must free.
*/
-struct LinkNode *BKE_object_groups(Object *ob)
+struct LinkNode *BKE_object_groups(Main *bmain, Object *ob)
{
LinkNode *group_linknode = NULL;
Group *group = NULL;
- while ((group = BKE_group_object_find(group, ob))) {
+ while ((group = BKE_group_object_find(bmain, group, ob))) {
BLI_linklist_prepend(&group_linknode, group);
}
return group_linknode;
}
-void BKE_object_groups_clear(Scene *scene, Base *base, Object *object)
+void BKE_object_groups_clear(Main *bmain, Scene *scene, Base *base, Object *object)
{
Group *group = NULL;
@@ -3405,8 +3405,8 @@ void BKE_object_groups_clear(Scene *scene, Base *base, Object *object)
base = BKE_scene_base_find(scene, object);
}
- while ((group = BKE_group_object_find(group, base->object))) {
- BKE_group_object_unlink(group, object, scene, base);
+ while ((group = BKE_group_object_find(bmain, group, base->object))) {
+ BKE_group_object_unlink(bmain, group, object, scene, base);
}
}