[Bf-blender-cvs] [84820e7f580] master: Revert "Fix T62098: Outliner: Delete hierarchy crash"

[Bastien Montagne]

Commit: 84820e7f5806a0dbdf609e9dbc1c2d33030f4dbb
Author: Bastien Montagne
Date:   Fri Mar 1 23:04:16 2019 +0100
Branches: master
https://developer.blender.org/rB84820e7f5806a0dbdf609e9dbc1c2d33030f4dbb

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!

===================================================================

M	source/blender/editors/space_outliner/outliner_tools.c

===================================================================

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