diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:11:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:23:41 +0300 |
| commit | c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (patch) | |
| tree | 698066b5eade15949b0453796c4d9fc466df42ac /source/blender/editors/space_outliner/outliner_tools.c | |
| parent | 09d26cab0bdde16529debd3e0271252012ba69eb (diff) | |
Farewell Scene->basact
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 481497e15f1..ca168094ae2 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -424,7 +424,7 @@ static void object_delete_cb( if (scene->obedit == ob) 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, ob); + ED_object_base_free_and_unlink(CTX_data_main(C), scene, ob); /* leave for ED_outliner_id_unref to handle */ #if 0 te->directdata = NULL; @@ -928,7 +928,7 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s base->object->id.name + 2, scene->id.name + 2); return base_next; } - ED_base_object_free_and_unlink(CTX_data_main(C), scene, base->object); + ED_object_base_free_and_unlink(CTX_data_main(C), scene, base->object); return base_next; } |