[Bf-blender-cvs] [702e7bfd5c2] master: Cleanup: remove no-op BKE_collection_copy_full().

Bastien Montagne noreply at git.blender.org
Wed Mar 6 15:40:00 CET 2019


Commit: 702e7bfd5c27fe5d11c54e402e94c5bee9a1194e
Author: Bastien Montagne
Date:   Wed Mar 6 11:42:19 2019 +0100
Branches: master
https://developer.blender.org/rB702e7bfd5c27fe5d11c54e402e94c5bee9a1194e

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.

===================================================================

M	source/blender/blenkernel/BKE_collection.h
M	source/blender/blenkernel/intern/collection.c
M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 5e6f87e7f97..3ddc28dafdb 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -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 */
 
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index d351f112c8a..3776c6bd8ca 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -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);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 6567f98b520..1ae0de69005 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -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);



More information about the Bf-blender-cvs mailing list