diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-02 01:04:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-02 01:04:47 +0300 |
| commit | 84820e7f5806a0dbdf609e9dbc1c2d33030f4dbb (patch) | |
| tree | 8fb1a98283f869d68553e80dfc1d15c8c710e577 /source/blender/editors/space_outliner | |
| parent | ccecc409e4eae160609bfd7e6803cda2afd0c0eb (diff) | |
Revert "Fix T62098: Outliner: Delete hierarchy crash"
This reverts commit d1baed5e3d03864b7968867fb93f9daa3d70428f.
Next time please let original author of the buggy code to take care of
fixing the issue!
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 36aacfc164d..4b67c835e7f 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1067,9 +1067,12 @@ 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); - /* For now, usage of batch-deletion of objects it hidden behind that debug value, - * until we get some more testing of it - see T62098. */ + /* Keeping old 'safe and slow' code for a bit (new one enabled on 28/01/2019). */ 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( @@ -1077,10 +1080,6 @@ 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); |