diff options
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 5aff2a75e03..15e434f2de9 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -787,6 +787,8 @@ 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 f129bc9e2ea..1aee8c20cbc 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -346,7 +346,9 @@ static int collection_delete_exec(bContext *C, wmOperator *op) WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active); } - return OPERATOR_FINISHED; + /* Temporary fix to allow deleting both collections and objects at the same time + * using the same key mapping. */ + return OPERATOR_PASS_THROUGH; } void OUTLINER_OT_collection_delete(wmOperatorType *ot) |