diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-02-09 10:06:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-09 10:06:06 +0300 |
| commit | 7e5cabb6b65d6c5140cb513d5500944f28af3c98 (patch) | |
| tree | c0c11b264a47b7b32408f460947348157d94bcdc /source/blender/editors/space_outliner | |
| parent | ea3900c58f287dd2a2e13c67be77726cba7851c3 (diff) | |
Fix T47368: Crash re-linking object to scene
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index e88b4c20319..83677b6bd86 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); |