diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-08-27 20:41:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-08-27 20:44:49 +0300 |
| commit | 9bda62c136a5a2b799c43afefdf13c5f63e2e1e7 (patch) | |
| tree | db2f76b977f3972f7b3d6dec7e49c982e307ab3d /source | |
| parent | 490f966af5b76c5112ff161e2c9a784ae86b0b5d (diff) | |
Fix T69176: Outliner->BlenderFile->Delete not working on some objects.
Object not referenced in any scene would not be deletable with previous
code... that was fine in 2.7x since it was not supposed to happen, but
now we can just use the nuclear `BKE_id_delete` for objects as well,
will take care of properly unlinking everything as needed.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 2c4a648da65..5f4a08be9ba 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -680,7 +680,7 @@ static void object_delete_cb(bContext *C, if (ob == CTX_data_edit_object(C)) { ED_object_editmode_exit(C, EM_FREEDATA); } - ED_object_base_free_and_unlink(CTX_data_main(C), scene, ob); + BKE_id_delete(bmain, ob); /* leave for ED_outliner_id_unref to handle */ #if 0 te->directdata = NULL; |