diff options
Diffstat (limited to 'release/scripts/presets/keyconfig/keymap_data/blender_default.py')
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 6a33bc60cba..27abaa61339 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1080,12 +1080,7 @@ def km_view3d(params): {"properties": [("use_all_regions", True), ("center", False)]}), ("view3d.view_all", {"type": 'C', "value": 'PRESS', "shift": True}, {"properties": [("center", True)]}), - op_menu_pie( - "VIEW3D_MT_view_pie" if params.v3d_tilde_action == 'VIEW' else "VIEW3D_MT_transform_gizmo_pie", - {"type": 'ACCENT_GRAVE', "value": params.pie_value}, - ), - *(() if not params.use_pie_click_drag else - (("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'CLICK'}, None),)), + op_menu_pie("VIEW3D_MT_view_pie", {"type": 'D', "value": 'CLICK_DRAG'}), ("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'PRESS', "shift": True}, None), # Numpad views. ("view3d.view_camera", {"type": 'NUMPAD_0', "value": 'PRESS'}, None), @@ -1329,6 +1324,32 @@ def km_view3d(params): op_tool_cycle("builtin.select_box", {"type": 'W', "value": 'PRESS'}), ]) + # Tilda key. + if params.use_pie_click_drag: + items.extend([ + ("object.transfer_mode", + {"type": 'ACCENT_GRAVE', "value": 'CLICK' if params.use_pie_click_drag else 'PRESS'}, + None), + op_menu_pie( + "VIEW3D_MT_transform_gizmo_pie", + {"type": 'ACCENT_GRAVE', "value": 'CLICK_DRAG'}, + ) + ]) + else: + if params.v3d_tilde_action == 'OBJECT_SWITCH': + items.append( + ("object.transfer_mode", + {"type": 'ACCENT_GRAVE', "value": 'PRESS'}, + {"properties": [("use_eyedropper", False)]}) + ) + else: + items.append( + op_menu_pie( + "VIEW3D_MT_transform_gizmo_pie", + {"type": 'ACCENT_GRAVE', "value": 'PRESS'}, + ) + ) + return keymap @@ -2525,6 +2546,7 @@ def km_sequencercommon(params): {"properties": [("data_path", 'scene.sequence_editor.show_overlay')]}), ("wm.context_toggle_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.view_type'), ("value_1", 'SEQUENCER'), ("value_2", 'PREVIEW')]}), + ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), ]) if params.select_mouse == 'LEFTMOUSE' and not params.legacy: @@ -2565,7 +2587,6 @@ def km_sequencer(params): ("sequencer.reload", {"type": 'R', "value": 'PRESS', "alt": True}, None), ("sequencer.reload", {"type": 'R', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("adjust_length", True)]}), - ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), ("sequencer.offset_clear", {"type": 'O', "value": 'PRESS', "alt": True}, None), ("sequencer.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), ("sequencer.delete", {"type": 'X', "value": 'PRESS'}, None), @@ -2573,7 +2594,7 @@ def km_sequencer(params): ("sequencer.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), ("sequencer.paste", {"type": 'V', "value": 'PRESS', "ctrl": True}, None), ("sequencer.paste", {"type": 'V', "value": 'PRESS', "ctrl": True, "shift": True}, - {"properties": [("keep_offset", True)]}), + {"properties": [("keep_offset", True)]}), ("sequencer.images_separate", {"type": 'Y', "value": 'PRESS'}, None), ("sequencer.meta_toggle", {"type": 'TAB', "value": 'PRESS'}, None), ("sequencer.meta_make", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), @@ -4486,8 +4507,6 @@ def km_sculpt(params): ) items.extend([ - # Transfer Sculpt Mode (release to avoid conflict with grease pencil drawing). - ("object.transfer_mode", {"type": 'D', "value": 'RELEASE'}, None), # Brush strokes ("sculpt.brush_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS'}, {"properties": [("mode", 'NORMAL')]}), |