diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-03-13 01:55:33 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-03-15 22:09:32 +0300 |
| commit | 713010bd7795c539c1c18afc3df9f25ab8ba6c12 (patch) | |
| tree | 00a02d1383b0e01fb6f81e7242ed3285dfe215f4 /source/blender/editors/object/object_relations.c | |
| parent | fcffbe1d1b31ed518b7a710c09d5fda389d8182e (diff) | |
Fix T62313 - No way to remove object from master collection in 3d view
This introduces a new iterator, FOREACH_COLLECTION, that unlike the
FOREACH_SCENE_COLLECTION it iterates over all the Blender file
collections, including the scene master collection, as well the database
ones (bmain).
Reviewers: brecht
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 95d1ddea7f3..6495575b76a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1394,7 +1394,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op) /* avoid searching all collections in source object each time */ if (type == MAKE_LINKS_GROUP) { - ob_collections = BKE_object_groups(bmain, ob_src); + ob_collections = BKE_object_groups(bmain, scene, ob_src); } CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases) @@ -1443,7 +1443,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op) LinkNode *collection_node; /* first clear collections */ - BKE_object_groups_clear(bmain, ob_dst); + BKE_object_groups_clear(bmain, scene, ob_dst); /* now add in the collections from the link nodes */ for (collection_node = ob_collections; collection_node; collection_node = collection_node->next) { |