From 52dc1ddaa0d1a1b30e327b3619bc2b920d8e4c19 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 8 Mar 2020 13:48:17 +1100 Subject: [PATCH] Revert "Outliner: Allow deleting entire selection" This reverts commit 62f238a65e334ccecae85134da0b05ba58382ae9. This prevents undo steps from being stored. --- .../scripts/presets/keyconfig/keymap_data/blender_default.py | 2 -- source/blender/editors/space_outliner/outliner_collections.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 15e434f2de9..5aff2a75e03 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -787,8 +787,6 @@ def km_outliner(params): ("outliner.collection_new", {"type": 'C', "value": 'PRESS'}, None), ("outliner.collection_delete", {"type": 'X', "value": 'PRESS'}, None), ("outliner.collection_delete", {"type": 'DEL', "value": 'PRESS'}, None), - ("outliner.object_operation", {"type": 'X', "value": 'PRESS'}, {"properties": [("type", 'DELETE')]}), - ("outliner.object_operation", {"type": 'DEL', "value": 'PRESS'}, {"properties": [("type", 'DELETE')]}), ("object.move_to_collection", {"type": 'M', "value": 'PRESS'}, None), ("object.link_to_collection", {"type": 'M', "value": 'PRESS', "shift": True}, None), ("outliner.collection_exclude_set", {"type": 'E', "value": 'PRESS'}, None), diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 1aee8c20cbc..f129bc9e2ea 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -346,9 +346,7 @@ static int collection_delete_exec(bContext *C, wmOperator *op) WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active); } - /* Temporary fix to allow deleting both collections and objects at the same time - * using the same key mapping. */ - return OPERATOR_PASS_THROUGH; + return OPERATOR_FINISHED; } void OUTLINER_OT_collection_delete(wmOperatorType *ot)