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 | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 0af7493ed47..b76afc6f35f 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -3316,7 +3316,7 @@ def km_grease_pencil_stroke_edit_mode(params): # Separate ("gpencil.stroke_separate", {"type": 'P', "value": 'PRESS'}, None), # Split and joint strokes - ("gpencil.stroke_split", {"type": 'V', "value": 'PRESS'}, None), + ("gpencil.stroke_split", {"type": 'V', "value": 'PRESS', "shift": True}, None), ("gpencil.stroke_join", {"type": 'J', "value": 'PRESS', "ctrl": True}, None), ("gpencil.stroke_join", {"type": 'J', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("type", 'JOINCOPY')]}), @@ -3361,9 +3361,6 @@ def km_grease_pencil_stroke_edit_mode(params): # Proportional editing. *_template_items_proportional_editing( params, connected=True, toggle_data_path='tool_settings.use_proportional_edit'), - # Curve edit mode toggle. - ("wm.context_toggle", {"type": 'U', "value": 'PRESS'}, - {"properties": [("data_path", 'gpencil_data.use_curve_edit')]}), # Add menu ("object.gpencil_add", {"type": 'A', "value": 'PRESS', "shift": True}, None), # Vertex group menu @@ -3381,6 +3378,8 @@ def km_grease_pencil_stroke_edit_mode(params): op_menu("VIEW3D_MT_gpencil_animation", {"type": 'I', "value": 'PRESS'}), # Context menu *_template_items_context_menu("VIEW3D_MT_gpencil_edit_context_menu", params.context_menu_event), + # Set handle type + ("gpencil.stroke_editcurve_set_handle_type", {"type": 'V', "value": 'PRESS'}, None), ]) if params.legacy: @@ -3391,21 +3390,6 @@ def km_grease_pencil_stroke_edit_mode(params): return keymap -def km_grease_pencil_stroke_curve_edit_mode(_params): - items = [] - keymap = ( - "Grease Pencil Stroke Curve Edit Mode", - {"space_type": 'EMPTY', "region_type": 'WINDOW'}, - {"items": items}, - ) - - items.extend([ - # Set handle type - ("gpencil.stroke_editcurve_set_handle_type", {"type": 'V', "value": 'PRESS'}, None), - ]) - - return keymap - def km_grease_pencil_stroke_paint_mode(params): items = [] keymap = ( @@ -5747,6 +5731,33 @@ def km_generic_gizmo_tweak_modal_map(_params): return keymap +def km_gpencil_curve_draw_modal_map(_params): + items = [] + keymap = ( + "Curve Draw Tool Modal Map", + {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True}, + {"items": items}, + ) + + items.extend([ + ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None), + ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'SPACE', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "any": True}, None), + ("FREE_HANDLE_ON", {"type": 'RIGHT_ALT', "value": 'PRESS', "any": True}, None), + ("FREE_HANDLE_OFF", {"type": 'RIGHT_ALT', "value": 'RELEASE', "any": True}, None), + ("FREE_HANDLE_ON", {"type": 'LEFT_ALT', "value": 'PRESS', "any": True}, None), + ("FREE_HANDLE_OFF", {"type": 'LEFT_ALT', "value": 'RELEASE', "any": True}, None), + ("CYCLIC_TOGGLE", {"type": 'C', "value": 'PRESS', "any": True}, None), + ("DELETE_LAST", {"type": 'X', "value": 'PRESS', "any": True}, None), + ("SET_THICKNESS", {"type": 'F', "value": 'PRESS', "any": True}, None), + ]) + + return keymap + + # ------------------------------------------------------------------------------ # Popup Keymaps @@ -6854,6 +6865,15 @@ def km_3d_view_tool_paint_gpencil_eyedropper(params): ]}, ) +def km_3d_view_tool_paint_gpencil_curve_pen(params): + return ( + "3D View Tool: Paint Gpencil, Bézier Pen", + {"space_type": 'VIEW_3D', "region_type": 'WINDOW'}, + {"items": [ + ("gpencil.draw_curve", {"type": params.tool_mouse, "value": 'PRESS'}, {"properties":[]}), + ]}, + ) + def km_3d_view_tool_paint_gpencil_interpolate(params): return ( "3D View Tool: Paint Gpencil, Interpolate", @@ -6864,6 +6884,7 @@ def km_3d_view_tool_paint_gpencil_interpolate(params): ]}, ) + def km_3d_view_tool_edit_gpencil_select(params): return ( "3D View Tool: Edit Gpencil, Tweak", @@ -7119,7 +7140,6 @@ def generate_keymaps(params=None): # Modes. km_grease_pencil(params), - km_grease_pencil_stroke_curve_edit_mode(params), km_grease_pencil_stroke_edit_mode(params), km_grease_pencil_stroke_paint_mode(params), km_grease_pencil_stroke_paint_draw_brush(params), @@ -7184,6 +7204,7 @@ def generate_keymaps(params=None): km_view3d_dolly_modal(params), km_paint_stroke_modal(params), km_sculpt_expand_modal(params), + km_gpencil_curve_draw_modal_map(params), # Gizmos. km_generic_gizmo(params), @@ -7292,6 +7313,7 @@ def generate_keymaps(params=None): km_3d_view_tool_paint_gpencil_curve(params), km_3d_view_tool_paint_gpencil_cutter(params), km_3d_view_tool_paint_gpencil_eyedropper(params), + km_3d_view_tool_paint_gpencil_curve_pen(params), km_3d_view_tool_paint_gpencil_interpolate(params), km_3d_view_tool_edit_gpencil_select(params), km_3d_view_tool_edit_gpencil_select_box(params), |