[Bf-blender-cvs] [7e5cabb] master: Fix T47368: Crash re-linking object to scene

[Campbell Barton]

Commit: 7e5cabb6b65d6c5140cb513d5500944f28af3c98
Author: Campbell Barton
Date:   Tue Feb 9 18:06:06 2016 +1100
Branches: master
https://developer.blender.org/rB7e5cabb6b65d6c5140cb513d5500944f28af3c98

Fix T47368: Crash re-linking object to scene

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

M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index e88b4c2..83677b6 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -400,8 +400,11 @@ static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te,
 			ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);
 		
 		ED_base_object_free_and_unlink(CTX_data_main(C), scene, base);
+		/* leave for ED_outliner_id_unref to handle */
+#if 0
 		te->directdata = NULL;
 		tselem->id = NULL;
+#endif
 	}
 }
 
@@ -828,8 +831,11 @@ static void object_delete_hierarchy_cb(
 		}
 
 		outline_delete_hierarchy(C, scene, base);
+		/* leave for ED_outliner_id_unref to handle */
+#if 0
 		te->directdata = NULL;
 		tselem->id = NULL;
+#endif
 	}
 
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);