diff options
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 4b67c835e7f..36aacfc164d 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1067,12 +1067,9 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op) ViewLayer *view_layer = CTX_data_view_layer(C); const Base *basact_prev = BASACT(view_layer); - /* Keeping old 'safe and slow' code for a bit (new one enabled on 28/01/2019). */ + /* For now, usage of batch-deletion of objects it hidden behind that debug value, + * until we get some more testing of it - see T62098. */ if (G.debug_value == 666) { - outliner_do_object_operation_ex( - C, op->reports, scene, soops, &soops->tree, object_delete_hierarchy_cb, NULL, false); - } - else { BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false); outliner_do_object_operation_ex( @@ -1080,6 +1077,10 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op) BKE_id_multi_tagged_delete(bmain); } + else { + outliner_do_object_operation_ex( + C, op->reports, scene, soops, &soops->tree, object_delete_hierarchy_cb, NULL, false); + } /* XXX: See OL_OP_DELETE comment above. */ outliner_cleanup_tree(soops); |