From d7dd7403a8137e1043df4443898a677291726f0e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 Mar 2022 15:43:24 +1100 Subject: WM: avoid hard coded modifier key checks in object.hide_collection These checks aren't always valid when there are multiple events in the queue. --- .../keyconfig/keymap_data/blender_default.py | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'release') diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 5a12d5c79f9..80794d9f23d 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -326,6 +326,22 @@ def _template_items_hide_reveal_actions(op_hide, op_reveal): ] +def _template_object_hide_collection_from_number_keys(): + return [ + ("object.hide_collection", { + "type": NUMBERS_1[i], "value": 'PRESS', + **({"shift": True} if extend else {}), + **({"alt": True} if add_10 else {}), + }, {"properties": [ + ("collection_index", i + (11 if add_10 else 1)), + ("extend", extend), + ]}) + for extend in (False, True) + for add_10 in (False, True) + for i in range(10) + ] + + def _template_items_object_subdivision_set(): return [ ("object.subdivision_set", @@ -4410,13 +4426,7 @@ def km_pose(params): ("pose.breakdown", {"type": 'E', "value": 'PRESS', "shift": True}, None), ("pose.blend_to_neighbor", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, None), op_menu("VIEW3D_MT_pose_propagate", {"type": 'P', "value": 'PRESS', "alt": True}), - *( - (("object.hide_collection", - {"type": NUMBERS_1[i], "value": 'PRESS', "any": True}, - {"properties": [("collection_index", i + 1)]}) - for i in range(10) - ) - ), + *_template_object_hide_collection_from_number_keys(), *_template_items_context_menu("VIEW3D_MT_pose_context_menu", params.context_menu_event), ]) @@ -4486,13 +4496,7 @@ def km_object_mode(params): ("object.link_to_collection", {"type": 'M', "value": 'PRESS', "shift": True}, None), *_template_items_hide_reveal_actions("object.hide_view_set", "object.hide_view_clear"), ("object.hide_collection", {"type": 'H', "value": 'PRESS', "ctrl": True}, None), - *( - (("object.hide_collection", - {"type": NUMBERS_1[i], "value": 'PRESS', "any": True}, - {"properties": [("collection_index", i + 1)]}) - for i in range(10) - ) - ), + *_template_object_hide_collection_from_number_keys(), *_template_items_context_menu("VIEW3D_MT_object_context_menu", params.context_menu_event), ]) -- cgit v1.2.3