From eb447bef61c7f1f59d364a2d4eab0b3db142f494 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Wed, 7 Jun 2023 17:21:21 +0200 Subject: [PATCH 1/8] Changed stencil to click and drag --- .../keyconfig/keymap_data/blender_default.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index bc5370ff192..e55fd5a1916 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5086,17 +5086,17 @@ def km_image_paint(params): ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("image_paint", color=True, zoom=True, rotation=True, secondary_rotation=True), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'image_paint_object.data.use_paint_mask')]}), @@ -5134,17 +5134,17 @@ def km_vertex_paint(params): ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("vertex_paint", color=True, rotation=True), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'vertex_paint_object.data.use_paint_mask')]}), @@ -5331,17 +5331,17 @@ def km_sculpt(params): {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("sculpt", rotation=True), # Stencil - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), # Tools ("paint.brush_select", {"type": 'X', "value": 'PRESS'}, -- 2.30.2 From cd9876dafe8251172913b37fc33a1f0fc7dce193 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Wed, 7 Jun 2023 18:46:53 +0200 Subject: [PATCH 2/8] Remap sample operators --- .../keyconfig/keymap_data/blender_default.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index e55fd5a1916..1ce1d693905 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -4274,7 +4274,7 @@ def km_grease_pencil_stroke_weight_mode(params): # Toggle Add/Subtract for weight draw tool ("gpencil.weight_toggle_direction", {"type": 'D', "value": 'PRESS'}, None), # Weight sample - ("gpencil.weight_sample", {"type": params.action_mouse, "value": 'PRESS', "ctrl": True}, None), + ("gpencil.weight_sample", {"type": 'X', "value": 'PRESS', "shift": True}, None), ]) if params.select_mouse == 'LEFTMOUSE': @@ -5080,7 +5080,7 @@ def km_image_paint(params): {"properties": [("mode", 'INVERT')]}), ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None), ("paint.grab_clone", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, None), - ("paint.sample_color", {"type": 'S', "value": 'PRESS'}, None), + ("paint.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, @@ -5127,7 +5127,7 @@ def km_vertex_paint(params): ("paint.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'INVERT')]}), ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None), - ("paint.sample_color", {"type": 'S', "value": 'PRESS'}, None), + ("paint.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("paint.vertex_color_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), @@ -5176,12 +5176,9 @@ def km_weight_paint(params): ) items.extend([ - # Transform Actions. - *_template_items_transform_actions(params), - - ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), - ("paint.weight_sample", {"type": params.action_mouse, "value": 'PRESS', "ctrl": True}, None), - ("paint.weight_sample_group", {"type": params.action_mouse, "value": 'PRESS', "shift": True}, None), + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, None), + ("paint.weight_sample", {"type": 'X', "value": 'PRESS', "shift": True}, None), + ("paint.weight_sample_group", {"type": 'X', "value": 'PRESS', "ctrl": True, "shift": True}, None), ("paint.weight_gradient", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("type", 'RADIAL')]}), ("paint.weight_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), @@ -5323,7 +5320,7 @@ def km_sculpt(params): ("object.voxel_size_edit", {"type": 'R', "value": 'PRESS'}, None), ("object.quadriflow_remesh", {"type": 'R', "value": 'PRESS', "ctrl": True, "alt": True}, None), # Color - ("sculpt.sample_color", {"type": 'S', "value": 'PRESS'}, None), + ("sculpt.sample_color", {"type": 'X', "value": 'PRESS', "shift": True,}, None), # Brush properties ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), -- 2.30.2 From 4b7f8c97b8145350924e5a08c1b62010795160f6 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Thu, 8 Jun 2023 14:07:45 +0200 Subject: [PATCH 3/8] Various more changes to paint/sculpt modes --- .../keyconfig/keymap_data/blender_default.py | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 1ce1d693905..fc08e2b00ae 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5078,8 +5078,10 @@ def km_image_paint(params): {"properties": [("mode", 'NORMAL')]}), ("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'INVERT')]}), + ("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, + {"properties": [("mode", 'SMOOTH')]}), ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None), - ("paint.grab_clone", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, None), + ("paint.grab_clone", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, None), ("paint.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), @@ -5126,9 +5128,11 @@ def km_vertex_paint(params): {"properties": [("mode", 'NORMAL')]}), ("paint.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'INVERT')]}), + ("paint.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, + {"properties": [("mode", 'SMOOTH')]}), ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None), ("paint.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("paint.vertex_color_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), + ("paint.vertex_color_set", {"type": 'X', "value": 'PRESS', "ctrl": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, @@ -5150,7 +5154,7 @@ def km_vertex_paint(params): {"properties": [("data_path", 'vertex_paint_object.data.use_paint_mask')]}), ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.vertex_paint.brush.use_smooth_stroke')]}), - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', "alt": True}, {"properties": [("data_path", 'tool_settings.vertex_paint.brush.stroke_method')]}), ("paint.face_vert_reveal", {"type": 'H', "value": 'PRESS', "alt": True}, None), *_template_items_context_panel("VIEW3D_PT_paint_vertex_context_menu", params.context_menu_event), @@ -5176,12 +5180,19 @@ def km_weight_paint(params): ) items.extend([ - ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, None), + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, + {"properties": [("mode", 'NORMAL')]}), + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', 'ctrl': True}, + {"properties": [("mode", 'INVERT')]}), + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', 'shift': True}, + {"properties": [("mode", 'SMOOTH')]}), ("paint.weight_sample", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("paint.weight_sample_group", {"type": 'X', "value": 'PRESS', "ctrl": True, "shift": True}, None), - ("paint.weight_gradient", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, + ("paint.weight_gradient", {"type": 'A', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("type", 'RADIAL')]}), - ("paint.weight_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), + ("paint.weight_gradient", {"type": 'A', "value": 'PRESS', "shift": True}, + {"properties": [("type", 'LINEAR')]}), + ("paint.weight_set", {"type": 'X', "value": 'PRESS', "ctrl": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, @@ -5189,7 +5200,7 @@ def km_weight_paint(params): *_template_paint_radial_control("weight_paint"), ("wm.radial_control", {"type": 'F', "value": 'PRESS', "ctrl": True}, radial_control_properties("weight_paint", 'weight', 'use_unified_weight')), - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', 'alt': True}, {"properties": [("data_path", 'tool_settings.vertex_paint.brush.stroke_method')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'weight_paint_object.data.use_paint_mask')]}), @@ -5266,7 +5277,7 @@ def km_sculpt(params): ("invert", False), ("use_mask_preserve", True), ]}), - ("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True}, + ("sculpt.expand", {"type": 'E', "value": 'PRESS', "shift": True}, {"properties": [ ("target", "FACE_SETS"), ("falloff_type", "GEODESIC"), @@ -5274,7 +5285,7 @@ def km_sculpt(params): ("use_mask_preserve", False), ("use_modify_active", False), ]}), - ("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True, "alt": True}, + ("sculpt.expand", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [ ("target", "FACE_SETS"), ("falloff_type", "BOUNDARY_FACE_SET"), @@ -5284,22 +5295,22 @@ def km_sculpt(params): ]}), # Partial Visibility Show/hide # Match keys from: `_template_items_hide_reveal_actions`, cannot use because arguments aren't compatible. - ("sculpt.face_set_change_visibility", {"type": 'H', "value": 'PRESS'}, - {"properties": [("mode", 'TOGGLE')]}), ("sculpt.face_set_change_visibility", {"type": 'H', "value": 'PRESS', "shift": True}, + {"properties": [("mode", 'TOGGLE')]}), + ("sculpt.face_set_change_visibility", {"type": 'H', "value": 'PRESS'}, {"properties": [("mode", 'HIDE_ACTIVE')]}), ("sculpt.reveal_all", {"type": 'H', "value": 'PRESS', "alt": True}, {"properties": []}), - ("sculpt.face_set_edit", {"type": 'W', "value": 'PRESS', "ctrl": True}, + ("sculpt.face_set_edit", {"type": 'E', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'GROW')]}), - ("sculpt.face_set_edit", {"type": 'W', "value": 'PRESS', "ctrl": True, "alt": True}, + ("sculpt.face_set_edit", {"type": 'E', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("mode", 'SHRINK')]}), # Subdivision levels *_template_items_object_subdivision_set(), - ("object.subdivision_set", {"type": 'PAGE_UP', "value": 'PRESS', "repeat": True}, + ("object.subdivision_set", {"type": '2', "value": 'PRESS', 'alt': True, "repeat": True}, {"properties": [("level", 1), ("relative", True)]}), - ("object.subdivision_set", {"type": 'PAGE_DOWN', "value": 'PRESS', "repeat": True}, + ("object.subdivision_set", {"type": '1', "value": 'PRESS', 'alt': True, "repeat": True}, {"properties": [("level", -1), ("relative", True)]}), # Mask ("paint.mask_flood_fill", {"type": 'M', "value": 'PRESS', "alt": True}, @@ -5315,12 +5326,14 @@ def km_sculpt(params): ("sculpt.dynamic_topology_toggle", {"type": 'D', "value": 'PRESS', "ctrl": True}, None), ("sculpt.dyntopo_detail_size_edit", {"type": 'R', "value": 'PRESS'}, None), ("sculpt.set_detail_size", {"type": 'D', "value": 'PRESS', "shift": True, "alt": True}, None), + ("sculpt.detail_flood_fill", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), # Remesh ("object.voxel_remesh", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), ("object.voxel_size_edit", {"type": 'R', "value": 'PRESS'}, None), ("object.quadriflow_remesh", {"type": 'R', "value": 'PRESS', "ctrl": True, "alt": True}, None), # Color - ("sculpt.sample_color", {"type": 'X', "value": 'PRESS', "shift": True,}, None), + ("sculpt.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), + ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS',}, None), # Brush properties ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), @@ -5364,13 +5377,13 @@ def km_sculpt(params): ("paint.brush_select", {"type": 'M', "value": 'PRESS'}, {"properties": [("sculpt_tool", 'MASK'), ("toggle", True), ("create_missing", True)]}), # Menus - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', 'alt': True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.stroke_method')]}), ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.use_smooth_stroke')]}), op_menu_pie("VIEW3D_MT_sculpt_mask_edit_pie", {"type": 'A', "value": 'PRESS'}), op_menu_pie("VIEW3D_MT_sculpt_automasking_pie", {"type": 'A', "alt": True, "value": 'PRESS'}), - op_menu_pie("VIEW3D_MT_sculpt_face_sets_edit_pie", {"type": 'W', "value": 'PRESS'}), + op_menu_pie("VIEW3D_MT_sculpt_face_sets_edit_pie", {"type": 'E', "value": 'PRESS'}), *_template_items_context_panel("VIEW3D_PT_sculpt_context_menu", params.context_menu_event), ]) -- 2.30.2 From 955bc73a79c87933ca4e94df4ae7d01f90b0655f Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Thu, 8 Jun 2023 22:16:23 +0200 Subject: [PATCH 4/8] Syntax fixes --- .../keyconfig/keymap_data/blender_default.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index fc08e2b00ae..ad724c032c1 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5182,9 +5182,9 @@ def km_weight_paint(params): items.extend([ ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, {"properties": [("mode", 'NORMAL')]}), - ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', 'ctrl': True}, + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'INVERT')]}), - ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', 'shift': True}, + ("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("mode", 'SMOOTH')]}), ("paint.weight_sample", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("paint.weight_sample_group", {"type": 'X', "value": 'PRESS', "ctrl": True, "shift": True}, None), @@ -5200,7 +5200,7 @@ def km_weight_paint(params): *_template_paint_radial_control("weight_paint"), ("wm.radial_control", {"type": 'F', "value": 'PRESS', "ctrl": True}, radial_control_properties("weight_paint", 'weight', 'use_unified_weight')), - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', 'alt': True}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', "alt": True}, {"properties": [("data_path", 'tool_settings.vertex_paint.brush.stroke_method')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'weight_paint_object.data.use_paint_mask')]}), @@ -5308,10 +5308,10 @@ def km_sculpt(params): {"properties": [("mode", 'SHRINK')]}), # Subdivision levels *_template_items_object_subdivision_set(), - ("object.subdivision_set", {"type": '2', "value": 'PRESS', 'alt': True, "repeat": True}, - {"properties": [("level", 1), ("relative", True)]}), - ("object.subdivision_set", {"type": '1', "value": 'PRESS', 'alt': True, "repeat": True}, + ("object.subdivision_set", {"type": 'ONE', "value": 'PRESS', "alt": True, "repeat": True}, {"properties": [("level", -1), ("relative", True)]}), + ("object.subdivision_set", {"type": 'TWO', "value": 'PRESS', "alt": True, "repeat": True}, + {"properties": [("level", 1), ("relative", True)]}), # Mask ("paint.mask_flood_fill", {"type": 'M', "value": 'PRESS', "alt": True}, {"properties": [("mode", 'VALUE'), ("value", 0.0)]}), @@ -5353,6 +5353,9 @@ def km_sculpt(params): {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), + # Sculpt Session Pivot Point + #("sculpt.set_pivot_position", {"type": 'RIGHTMOUSE', 'value': 'PRESS', "shift": True}, + #{"properties": [("mode", 'SURFACE')]}), # Tools ("paint.brush_select", {"type": 'X', "value": 'PRESS'}, {"properties": [("sculpt_tool", 'DRAW')]}), @@ -5377,7 +5380,7 @@ def km_sculpt(params): ("paint.brush_select", {"type": 'M', "value": 'PRESS'}, {"properties": [("sculpt_tool", 'MASK'), ("toggle", True), ("create_missing", True)]}), # Menus - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', 'alt': True}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', "alt": True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.stroke_method')]}), ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.use_smooth_stroke')]}), -- 2.30.2 From 916b318c4774d22f2ea392aa9ff722a51ef38b9b Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Thu, 8 Jun 2023 23:38:15 +0200 Subject: [PATCH 5/8] Made remaining consistency changes --- .../keyconfig/keymap_data/blender_default.py | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index ad724c032c1..fffacfb3e59 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -304,7 +304,7 @@ def op_tool_optional(op_args, tool_pair, params): def _template_items_context_menu(menu, key_args_primary): return [ op_menu(menu, kmi_args) - for kmi_args in (key_args_primary, {"type": 'APP', "value": 'PRESS'}) + for kmi_args in (key_args_primary, {"type": 'APP', "value": 'CLICK_DRAG'}) ] @@ -3723,8 +3723,8 @@ def km_grease_pencil_stroke_edit_mode(params): ("gpencil.dissolve", {"type": 'DEL', "value": 'PRESS', "ctrl": True}, None), # Animation menu ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), + # Delete Animation menu + op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), # Separate ("gpencil.stroke_separate", {"type": 'P', "value": 'PRESS'}, None), # Split and joint strokes @@ -3832,12 +3832,10 @@ def km_grease_pencil_stroke_paint_mode(params): {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), - # Draw delete menu - op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'X', "value": 'PRESS'}), # Animation menu ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), + # Delete Animation menu + op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), # Interpolation op_tool_optional( ("gpencil.interpolate", {"type": 'E', "value": 'PRESS', "ctrl": True}, None), @@ -4032,18 +4030,18 @@ def km_grease_pencil_stroke_sculpt_mode(params): ("gpencil.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), # Display *_grease_pencil_display(), - # Keyframe menu - ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Active layer op_menu("GPENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}), # Active material op_menu("GPENCIL_MT_material_active", {"type": 'U', "value": 'PRESS'}), # Merge Layer ("gpencil.layer_merge", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None), - # Keyframe menu + # Animation menu op_menu("VIEW3D_MT_gpencil_animation", {"type": 'I', "value": 'PRESS'}), + # Insert blank keyframe + ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), + # Delete Animation menu + op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), # Context menu *_template_items_context_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event), # Automasking Pie menu @@ -4259,16 +4257,16 @@ def km_grease_pencil_stroke_weight_mode(params): {"properties": [("scalar", 1.0 / 0.9)]}), # Display *_grease_pencil_display(), - # Keyframe menu - ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Active layer op_menu("GPENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}), # Merge Layer ("gpencil.layer_merge", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None), # Keyframe menu op_menu("VIEW3D_MT_gpencil_animation", {"type": 'I', "value": 'PRESS'}), + # Insert blank keyframe + ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), + # Delete Animation menu + op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), # Context menu *_template_items_context_panel("VIEW3D_PT_gpencil_weight_context_menu", params.context_menu_event), # Toggle Add/Subtract for weight draw tool @@ -4378,20 +4376,22 @@ def km_grease_pencil_stroke_vertex_mode(params): {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), + # Color Flip + ("gpencil.tint_flip", {"type": 'X', "value": 'PRESS'}, None), # Display *_grease_pencil_display(), # Tools op_tool("builtin_brush.Draw", {"type": 'D', "value": 'PRESS'}), - # Keyframe menu - ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), - ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Active layer op_menu("GPENCIL_MT_layer_active", {"type": 'Y', "value": 'PRESS'}), # Merge Layer ("gpencil.layer_merge", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None), - # Keyframe menu + # Animation menu op_menu("VIEW3D_MT_gpencil_animation", {"type": 'I', "value": 'PRESS'}), + # Insert blank keyframe + ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), + # Delete Animation menu + op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), # Vertex Paint context menu op_panel("VIEW3D_PT_gpencil_vertex_context_menu", params.context_menu_event), ]) @@ -5354,8 +5354,8 @@ def km_sculpt(params): ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), # Sculpt Session Pivot Point - #("sculpt.set_pivot_position", {"type": 'RIGHTMOUSE', 'value': 'PRESS', "shift": True}, - #{"properties": [("mode", 'SURFACE')]}), + ("sculpt.set_pivot_position", {"type": 'RIGHTMOUSE', 'value': 'PRESS', "shift": True}, + {"properties": [("mode", 'SURFACE')]}), # Tools ("paint.brush_select", {"type": 'X', "value": 'PRESS'}, {"properties": [("sculpt_tool", 'DRAW')]}), @@ -5901,6 +5901,10 @@ def km_sculpt_curves(params): ("curves.set_selection_domain", {"type": 'ONE', "value": 'PRESS'}, {"properties": [("domain", 'POINT')]}), ("curves.set_selection_domain", {"type": 'TWO', "value": 'PRESS'}, {"properties": [("domain", 'CURVE')]}), *_template_paint_radial_control("curves_sculpt"), + ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, + {"properties": [("scalar", 0.9)]}), + ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, + {"properties": [("scalar", 1.0 / 0.9)]}), *_template_items_select_actions(params, "curves.select_all"), ("sculpt_curves.min_distance_edit", {"type": 'R', "value": 'PRESS'}, {}), ("sculpt_curves.select_grow", {"type": 'A', "value": 'PRESS', "shift": True}, {}), -- 2.30.2 From b19008d5275d994dde08a623a9a058d0b206d1a0 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Fri, 9 Jun 2023 00:06:17 +0200 Subject: [PATCH 6/8] Correct right click menu change --- scripts/presets/keyconfig/keymap_data/blender_default.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index fffacfb3e59..b726447f78e 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -179,7 +179,7 @@ class Params: if self.legacy: self.context_menu_event = {"type": 'W', "value": 'PRESS'} else: - self.context_menu_event = {"type": 'RIGHTMOUSE', "value": 'PRESS'} + self.context_menu_event = {"type": 'RIGHTMOUSE', "value": 'CLICK'} self.cursor_set_event = {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True} self.cursor_tweak_event = {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True} @@ -304,7 +304,7 @@ def op_tool_optional(op_args, tool_pair, params): def _template_items_context_menu(menu, key_args_primary): return [ op_menu(menu, kmi_args) - for kmi_args in (key_args_primary, {"type": 'APP', "value": 'CLICK_DRAG'}) + for kmi_args in (key_args_primary, {"type": 'APP', "value": 'PRESS'}) ] -- 2.30.2 From 67f7e395258c47471f126a07ee3a0913ced3e803 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Wed, 12 Jul 2023 18:01:44 +0200 Subject: [PATCH 7/8] Revert stencil related changes. Add gpencil active_frames_delete_all back --- .../keyconfig/keymap_data/blender_default.py | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index b726447f78e..916cb8c004d 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -179,7 +179,7 @@ class Params: if self.legacy: self.context_menu_event = {"type": 'W', "value": 'PRESS'} else: - self.context_menu_event = {"type": 'RIGHTMOUSE', "value": 'CLICK'} + self.context_menu_event = {"type": 'RIGHTMOUSE', "value": 'PRESS'} self.cursor_set_event = {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True} self.cursor_tweak_event = {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True} @@ -3725,6 +3725,7 @@ def km_grease_pencil_stroke_edit_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), # Delete Animation menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), + ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Separate ("gpencil.stroke_separate", {"type": 'P', "value": 'PRESS'}, None), # Split and joint strokes @@ -3836,6 +3837,7 @@ def km_grease_pencil_stroke_paint_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), # Delete Animation menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), + ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Interpolation op_tool_optional( ("gpencil.interpolate", {"type": 'E', "value": 'PRESS', "ctrl": True}, None), @@ -4042,6 +4044,7 @@ def km_grease_pencil_stroke_sculpt_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), # Delete Animation menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), + ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Context menu *_template_items_context_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event), # Automasking Pie menu @@ -4267,6 +4270,7 @@ def km_grease_pencil_stroke_weight_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), # Delete Animation menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), + ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Context menu *_template_items_context_panel("VIEW3D_PT_gpencil_weight_context_menu", params.context_menu_event), # Toggle Add/Subtract for weight draw tool @@ -4392,6 +4396,7 @@ def km_grease_pencil_stroke_vertex_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), # Delete Animation menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'I', "value": 'PRESS', "alt": True}), + ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Vertex Paint context menu op_panel("VIEW3D_PT_gpencil_vertex_context_menu", params.context_menu_event), ]) @@ -5081,24 +5086,24 @@ def km_image_paint(params): ("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("mode", 'SMOOTH')]}), ("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None), - ("paint.grab_clone", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, None), + ("paint.grab_clone", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, None), ("paint.sample_color", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 0.9)]}), ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("image_paint", color=True, zoom=True, rotation=True, secondary_rotation=True), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'image_paint_object.data.use_paint_mask')]}), @@ -5138,17 +5143,17 @@ def km_vertex_paint(params): ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True}, {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("vertex_paint", color=True, rotation=True), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), ("wm.context_toggle", {"type": 'M', "value": 'PRESS'}, {"properties": [("data_path", 'vertex_paint_object.data.use_paint_mask')]}), @@ -5341,17 +5346,17 @@ def km_sculpt(params): {"properties": [("scalar", 1.0 / 0.9)]}), *_template_paint_radial_control("sculpt", rotation=True), # Stencil - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG'}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, {"properties": [("mode", 'TRANSLATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("mode", 'SCALE')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'ROTATION')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "alt": True}, {"properties": [("mode", 'TRANSLATION'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "shift": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("mode", 'SCALE'), ("texmode", 'SECONDARY')]}), - ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'CLICK_DRAG', "ctrl": True, "alt": True}, + ("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("mode", 'ROTATION'), ("texmode", 'SECONDARY')]}), # Sculpt Session Pivot Point ("sculpt.set_pivot_position", {"type": 'RIGHTMOUSE', 'value': 'PRESS', "shift": True}, -- 2.30.2 From 39eb97c7d66be6926b71512243a53abad9884b83 Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Wed, 26 Jul 2023 14:24:29 +0200 Subject: [PATCH 8/8] Various updates: - Reverted face set shortcut changes and only changed `W` pie - Fixed missing stroke method shortcut change for image paint --- .../presets/keyconfig/keymap_data/blender_default.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 916cb8c004d..a053e15845b 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5109,7 +5109,7 @@ def km_image_paint(params): {"properties": [("data_path", 'image_paint_object.data.use_paint_mask')]}), ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.image_paint.brush.use_smooth_stroke')]}), - ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, + ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS', "alt": True}, {"properties": [("data_path", 'tool_settings.image_paint.brush.stroke_method')]}), *_template_items_context_panel("VIEW3D_PT_paint_texture_context_menu", params.context_menu_event), ]) @@ -5282,7 +5282,7 @@ def km_sculpt(params): ("invert", False), ("use_mask_preserve", True), ]}), - ("sculpt.expand", {"type": 'E', "value": 'PRESS', "shift": True}, + ("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True}, {"properties": [ ("target", "FACE_SETS"), ("falloff_type", "GEODESIC"), @@ -5290,7 +5290,7 @@ def km_sculpt(params): ("use_mask_preserve", False), ("use_modify_active", False), ]}), - ("sculpt.expand", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, + ("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True, "alt": True}, {"properties": [ ("target", "FACE_SETS"), ("falloff_type", "BOUNDARY_FACE_SET"), @@ -5307,9 +5307,9 @@ def km_sculpt(params): ("sculpt.reveal_all", {"type": 'H', "value": 'PRESS', "alt": True}, {"properties": []}), - ("sculpt.face_set_edit", {"type": 'E', "value": 'PRESS', "ctrl": True}, + ("sculpt.face_set_edit", {"type": 'W', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'GROW')]}), - ("sculpt.face_set_edit", {"type": 'E', "value": 'PRESS', "shift": True, "ctrl": True}, + ("sculpt.face_set_edit", {"type": 'W', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("mode", 'SHRINK')]}), # Subdivision levels *_template_items_object_subdivision_set(), @@ -5391,7 +5391,7 @@ def km_sculpt(params): {"properties": [("data_path", 'tool_settings.sculpt.brush.use_smooth_stroke')]}), op_menu_pie("VIEW3D_MT_sculpt_mask_edit_pie", {"type": 'A', "value": 'PRESS'}), op_menu_pie("VIEW3D_MT_sculpt_automasking_pie", {"type": 'A', "alt": True, "value": 'PRESS'}), - op_menu_pie("VIEW3D_MT_sculpt_face_sets_edit_pie", {"type": 'E', "value": 'PRESS'}), + op_menu_pie("VIEW3D_MT_sculpt_face_sets_edit_pie", {"type": 'W', "alt": True, "value": 'PRESS'}), *_template_items_context_panel("VIEW3D_PT_sculpt_context_menu", params.context_menu_event), ]) -- 2.30.2