blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Revert "Outliner: Allow deleting entire selection" 

This reverts commit 62f238a65e.

This prevents undo steps from being stored.
This commit is contained in:
Campbell Barton 2020-03-08 13:48:17 +11:00
parent 62f238a65e
commit 52dc1ddaa0
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

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

4
source/blender/editors/space_outliner/outliner_collections.c
View File

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