[Bf-blender-cvs] [d80372c] render-layers: handle objects removal only on preprocess

[Dalai Felinto]

Commit: d80372c9f4908a358733dc7db35652d18a15ed8e
Author: Dalai Felinto
Date:   Wed Jan 4 18:34:49 2017 +0100
Branches: render-layers
https://developer.blender.org/rBd80372c9f4908a358733dc7db35652d18a15ed8e

handle objects removal only on preprocess

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

M	source/blender/blenkernel/intern/library_remap.c

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

diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 2bc4059..5351041 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. */