Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-05-22 06:14:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-05-22 06:14:28 +0300
commit7adbe62a09ca117323d827923a30b241afd729fc (patch)
treea74dadfa348ea106b6a990cceb236be3ea6b5921
parent2175cbe2ceeffc65517dd21ee94f19bc93094544 (diff)
Cleanup: tweaks for Object Non-modal keymap
Simplify adding non-legacy keymap items.
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py44
1 files changed, 21 insertions, 23 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 9bccc69d41f..dff3c452845 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5026,32 +5026,30 @@ def km_object_non_modal(params):
{"properties": [("mode", 'VERTEX_PAINT'), ("toggle", True)]}),
("object.mode_set", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'WEIGHT_PAINT'), ("toggle", True)]}),
- ])
- elif params.use_pie_click_drag:
- items.extend([
- ("object.mode_set", {"type": 'TAB', "value": 'CLICK'},
- {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
- op_menu_pie("VIEW3D_MT_object_mode_pie", {"type": 'TAB', "value": 'CLICK_DRAG'}),
- ("view3d.object_mode_pie_or_toggle", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, None),
- ])
- elif not params.use_v3d_tab_menu:
- items.extend([
- ("object.mode_set", {"type": 'TAB', "value": 'PRESS'},
- {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
- ("view3d.object_mode_pie_or_toggle", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, None),
- ])
- else:
- # Swap Tab/Ctrl-Tab
- items.extend([
- ("object.mode_set", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
- {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
- op_menu_pie("VIEW3D_MT_object_mode_pie", {"type": 'TAB', "value": 'PRESS'}),
- ])
- if params.legacy:
- items.extend([
("object.origin_set", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None),
])
+ else:
+ if params.use_pie_click_drag:
+ items.extend([
+ ("object.mode_set", {"type": 'TAB', "value": 'CLICK'},
+ {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
+ op_menu_pie("VIEW3D_MT_object_mode_pie", {"type": 'TAB', "value": 'CLICK_DRAG'}),
+ ("view3d.object_mode_pie_or_toggle", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, None),
+ ])
+ elif params.use_v3d_tab_menu:
+ # Swap Tab/Ctrl-Tab
+ items.extend([
+ ("object.mode_set", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
+ {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
+ op_menu_pie("VIEW3D_MT_object_mode_pie", {"type": 'TAB', "value": 'PRESS'}),
+ ])
+ else:
+ items.extend([
+ ("object.mode_set", {"type": 'TAB', "value": 'PRESS'},
+ {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
+ ("view3d.object_mode_pie_or_toggle", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, None),
+ ])
return keymap