diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-16 16:18:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:40:30 +0300 |
| commit | 2c435cf249cc01550c04e284eda3eb3cf6cf223e (patch) | |
| tree | 24cf037c531364483be0a3f80574f65358ae9000 /source/blender/editors/object/object_relations.c | |
| parent | 2e5ef864ab17fbfdb50531a77ee8e1637b8efef6 (diff) | |
Cleanup: get rid of `BKE_collection_copy`.
We want to get rid of those for all ID types ultimately, but that one
was only used in one place, being the only one calling
`BKE_collection_duplicate` without hierarchical duplicate and parent
collection pointer, effectively using the full power of the complex deep
duplication code for a mere `BKE_id_copy` call...
This will allow for further cleanup in duplicate code.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index fd2fcb11635..4a05658fc00 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1771,7 +1771,10 @@ static Collection *single_object_users_collection(Main *bmain, /* Generate new copies for objects in given collection and all its children, * and optionally also copy collections themselves. */ if (copy_collections && !is_master_collection) { - collection = ID_NEW_SET(collection, BKE_collection_copy(bmain, NULL, collection)); + Collection *collection_new; + BKE_id_copy(bmain, &collection->id, (ID **)&collection_new); + id_us_min(&collection_new->id); + collection = ID_NEW_SET(collection, collection_new); } /* We do not remap to new objects here, this is done in separate step. */ |