diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-09-02 18:42:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-09-02 19:39:08 +0300 |
| commit | 1fd5c90e63b6306e070db090bd272eb4ec942f60 (patch) | |
| tree | 6b991e7afb5b7994208661bc51f71957a5ad94a1 /source/blender/blenkernel/intern/scene.c | |
| parent | 99e8aeaa4a20933bdb6c7decafb0eac1e5bca002 (diff) | |
DatablockManagement: Cleanup: get rid of `BKE_collection_copy_master()`.
Now that we 'properly' support private ID data in lib management, there
is no reason anymore to have that custom func, badly named and
by-passing the whole generic ID management code.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index bfffe21ef56..885ce415ade 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -248,8 +248,10 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons /* Master Collection */ if (sce_src->master_collection) { - sce_dst->master_collection = BKE_collection_copy_master( - bmain, sce_src->master_collection, flag); + BKE_id_copy_ex(bmain, + (ID *)sce_src->master_collection, + (ID **)&sce_dst->master_collection, + flag_private_id_data); } /* View Layers */ |