diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-04 20:34:49 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-04 20:34:49 +0300 |
commit | d80372c9f4908a358733dc7db35652d18a15ed8e (patch) | |
tree | 620ea57bdf3b90624c26cc8455b7f88a83a9d6a9 /source/blender/blenkernel/intern/library_remap.c | |
parent | 7bd56f207d3008bbbdbd30fff0cdea7e030a17a4 (diff) |
handle objects removal only on preprocess
Diffstat (limited to 'source/blender/blenkernel/intern/library_remap.c')
-rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 2bc4059211e..5351041290a 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -363,15 +363,6 @@ static void libblock_remap_data_postprocess_object_fromgroup_update(Main *bmain, } } -static void libblock_remap_data_postprocess_object_fromcollection_update(Main *bmain, Object *old_ob, Object *new_ob) -{ - if (new_ob == NULL) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { - BKE_collections_object_remove(scene, old_ob); - } - } -} - static void libblock_remap_data_postprocess_group_scene_unlink(Main *UNUSED(bmain), Scene *sce, ID *old_id) { /* Note that here we assume no object has no base (i.e. all objects are assumed instanced @@ -581,7 +572,6 @@ void BKE_libblock_remap_locked( switch (GS(old_id->name)) { case ID_OB: libblock_remap_data_postprocess_object_fromgroup_update(bmain, (Object *)old_id, (Object *)new_id); - libblock_remap_data_postprocess_object_fromcollection_update(bmain, (Object *)old_id, (Object *)new_id); break; case ID_GR: if (!new_id) { /* Only affects us in case group was unlinked. */ |