From b69ed14ff745820d104dcf410c6fa64c841712c6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Jun 2019 15:53:11 +1000 Subject: Fix T65108: GPencil Sculpt mode select tools don't work Move the sculpt keymap from the mode to the tool. --- .../keyconfig/keymap_data/blender_default.py | 24 +++++++++++++++------- .../startup/bl_ui/space_toolsystem_toolbar.py | 4 ++++ 2 files changed, 21 insertions(+), 7 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 d940e81980d..5de9b7569f8 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -3170,13 +3170,7 @@ def km_grease_pencil_stroke_sculpt_mode(params): items.extend([ # Selection *_grease_pencil_selection(params), - # Painting - ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, - {"properties": [("wait_for_input", False)]}), - ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, - {"properties": [("wait_for_input", False)]}), - ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, - {"properties": [("wait_for_input", False)]}), + # Brush strength ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True}, {"properties": [("data_path_primary", 'tool_settings.gpencil_sculpt.brush.strength')]}), @@ -5738,6 +5732,21 @@ def km_3d_view_tool_edit_gpencil_to_sphere(params): ) +def km_3d_view_tool_sculpt_gpencil_paint(params): + return ( + "3D View Tool: Sculpt Gpencil, Paint", + {"space_type": 'VIEW_3D', "region_type": 'WINDOW'}, + {"items": [ + ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, + {"properties": [("wait_for_input", False)]}), + ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, + {"properties": [("wait_for_input", False)]}), + ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, + {"properties": [("wait_for_input", False)]}), + ]}, + ) + + def km_3d_view_tool_sculpt_gpencil_select(params): return ( "3D View Tool: Sculpt Gpencil, Select", @@ -5972,6 +5981,7 @@ def generate_keymaps(params=None): km_3d_view_tool_edit_gpencil_bend(params), km_3d_view_tool_edit_gpencil_shear(params), km_3d_view_tool_edit_gpencil_to_sphere(params), + km_3d_view_tool_sculpt_gpencil_paint(params), km_3d_view_tool_sculpt_gpencil_select(params), km_3d_view_tool_sculpt_gpencil_select_box(params), km_3d_view_tool_sculpt_gpencil_select_circle(params), diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 240d17b4816..95979be1477 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1466,6 +1466,10 @@ class _defs_gpencil_sculpt: icon_prefix="ops.gpencil.sculpt_", type=bpy.types.GPencilSculptSettings, attr="sculpt_tool", + tooldef_keywords=dict( + operator="gpencil.sculpt_paint", + keymap="3D View Tool: Sculpt Gpencil, Paint", + ), ) -- cgit v1.2.3