griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix T62098: Outliner: Delete hierarchy crash"

Browse Source 
This reverts commit d1baed5e3d.

Next time please let original author of the buggy code to take care of
fixing the issue!
This commit is contained in:
Bastien Montagne
2019-03-01 23:04:16 +01:00
parent ccecc409e4
commit 84820e7f58
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_outliner/outliner_tools.c
View File

@@ -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);