tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: remove no-op BKE_collection_copy_full(). 

That one was an empty place-holder, BKE_collection_duplicate() is now
doing that. And its call from full scene copying is not needed
currently, 'deep copy' in that case is handled in editor's
`ED_scene_add()`.

Note that at some point, we might want to move that logic into BKE, but
for now let's keep thing as they are - working.
This commit is contained in:
Bastien Montagne 2019-03-06 11:42:19 +01:00
parent 4dbf5e3a81
commit 702e7bfd5c
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_collection.h
View File

@ -59,7 +59,6 @@ void BKE_collection_make_local(struct Main *bmain, struct Collecti
struct Collection *BKE_collection_duplicate(struct Main *bmain, struct Collection *parent, struct Collection *collection, const bool do_hierarchy, const bool do_deep_copy);
struct Collection *BKE_collection_copy_master(struct Main *bmain, struct Collection *collection, const int flag);
void BKE_collection_copy_full(struct Main *bmain, struct Collection *collection);
/* Master Collection for Scene */

5
source/blender/blenkernel/intern/collection.c
View File

@ -339,11 +339,6 @@ Collection *BKE_collection_copy_master(Main *bmain, Collection *collection, cons
return collection_dst;
}
void BKE_collection_copy_full(Main *UNUSED(bmain), Collection *UNUSED(collection))
{
// TODO: implement full scene copy
}
void BKE_collection_make_local(Main *bmain, Collection *collection, const bool lib_local)
{
BKE_id_make_local_generic(bmain, &collection->id, true, lib_local);

3
source/blender/blenkernel/intern/scene.c
View File

@ -414,9 +414,6 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
BKE_id_copy_ex(bmain, (ID *)sce_copy->world, (ID **)&sce_copy->world, LIB_ID_COPY_ACTIONS);
}
/* Collections */
BKE_collection_copy_full(bmain, sce_copy->master_collection);
/* Full copy of GreasePencil. */
if (sce_copy->gpd) {
id_us_min(&sce_copy->gpd->id);