[Bf-blender-cvs] [8515be8] master: Remove redundant outliner lookup freeing objects

Campbell Barton noreply at git.blender.org
Mon May 4 08:14:06 CEST 2015


Commit: 8515be8a739b2ce88f7eb8f46d8a46df15d25231
Author: Campbell Barton
Date:   Mon May 4 15:55:52 2015 +1000
Branches: master
https://developer.blender.org/rB8515be8a739b2ce88f7eb8f46d8a46df15d25231

Remove redundant outliner lookup freeing objects

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 034c083..111aa84 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -809,16 +809,7 @@ void BKE_object_unlink(Object *ob)
 					}
 				}
 				else if (sl->spacetype == SPACE_OUTLINER) {
-					SpaceOops *so = (SpaceOops *)sl;
-
-					if (so->treestore) {
-						TreeStoreElem *tselem;
-						BLI_mempool_iter iter;
-						BLI_mempool_iternew(so->treestore, &iter);
-						while ((tselem = BLI_mempool_iterstep(&iter))) {
-							if (tselem->id == (ID *)ob) tselem->id = NULL;
-						}
-					}
+					/* now handled by WM_main_remove_editor_id_reference */
 				}
 				else if (sl->spacetype == SPACE_BUTS) {
 					SpaceButs *sbuts = (SpaceButs *)sl;




More information about the Bf-blender-cvs mailing list