Industry Compat keymap: Fix inconsistencies and conflicts with color swatches and other over-widget hotkeys

Sample hotkey is set to the I key now, similar to other apps.

Reported on Devtalk
This commit is contained in:
William Reynish 2019-07-20 14:45:27 +02:00
parent 4b980e2f57
commit e2b0647272
Notes: blender-bot 2023-02-14 06:00:45 +01:00
Referenced by issue #67443, Blender crashes when shifting from texture paint
Referenced by issue #67424, Blender crashes when entering edit mode from sculpting mode
Referenced by issue #67360, Problem with relations of particle physics 'keyed'
Referenced by issue #67258, Blender crashes when saving new texture image from texture context tab
Referenced by issue #67256, Object duplication after activating Dyntopo when changing parameters for new objects
1 changed files with 12 additions and 16 deletions

View File

@ -385,21 +385,21 @@ def km_user_interface(params):
items.extend([
# Eyedroppers all have the same event, and pass it through until
# a suitable eyedropper handles it.
("ui.eyedropper_color", {"type": 'E', "value": 'PRESS'}, None),
("ui.eyedropper_colorramp", {"type": 'E', "value": 'PRESS'}, None),
("ui.eyedropper_colorramp_point", {"type": 'E', "value": 'PRESS', "alt": True}, None),
("ui.eyedropper_id", {"type": 'E', "value": 'PRESS'}, None),
("ui.eyedropper_depth", {"type": 'E', "value": 'PRESS'}, None),
("ui.eyedropper_color", {"type": 'I', "value": 'PRESS'}, None),
("ui.eyedropper_colorramp", {"type": 'I', "value": 'PRESS'}, None),
("ui.eyedropper_colorramp_point", {"type": 'I', "value": 'PRESS', "alt": True}, None),
("ui.eyedropper_id", {"type": 'I', "value": 'PRESS'}, None),
("ui.eyedropper_depth", {"type": 'I', "value": 'PRESS'}, None),
# Copy data path
("ui.copy_data_path_button", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True}, None),
("ui.copy_data_path_button", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
("ui.copy_data_path_button", {"type": 'C', "value": 'PRESS', "ctrl": True}, None),
("ui.copy_data_path_button", {"type": 'C', "value": 'PRESS', "ctrl": True, "alt": True},
{"properties": [("full_path", True)]}),
# rames and drivers
("anim.keyframe_insert_button", {"type": 'S', "value": 'PRESS'}, None),
("anim.keyframe_delete_button", {"type": 'S', "value": 'PRESS', "alt": True}, None),
("anim.keyframe_clear_button", {"type": 'S', "value": 'PRESS', "shift": True, "alt": True}, None),
("anim.driver_button_add", {"type": 'D', "value": 'PRESS', "ctrl": True}, None),
("anim.driver_button_remove", {"type": 'D', "value": 'PRESS', "ctrl": True, "alt": True}, None),
("anim.driver_button_add", {"type": 'D', "value": 'PRESS'}, None),
("anim.driver_button_remove", {"type": 'D', "value": 'PRESS', "alt": True}, None),
("anim.keyingset_button_add", {"type": 'K', "value": 'PRESS'}, None),
("anim.keyingset_button_remove", {"type": 'K', "value": 'PRESS', "alt": True}, None),
])
@ -979,6 +979,7 @@ def km_image(params):
op_tool("builtin.transform", {"type": 'R', "value": 'PRESS'}),
op_tool("builtin.cursor", {"type": 'C', "value": 'PRESS'}),
op_tool("builtin.annotate", {"type": 'D', "value": 'PRESS'}),
op_tool("builtin.sample", {"type": 'I', "value": 'PRESS'}),
])
@ -2827,6 +2828,7 @@ def km_image_paint(params):
{"properties": [("mode", 'NORMAL')]}),
("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'INVERT')]}),
("paint.sample_color", {"type": 'I', "value": 'PRESS'}, None),
("paint.brush_colors_flip", {"type": 'X', "value": 'PRESS'}, None),
("paint.grab_clone", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
@ -2851,8 +2853,6 @@ def km_image_paint(params):
("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True},
{"properties": [("data_path", 'tool_settings.image_paint.brush.use_smooth_stroke')]}),
op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}),
("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'},
{"properties": [("data_path", 'tool_settings.image_paint.brush.stroke_method')]}),
op_panel("VIEW3D_PT_paint_texture_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}),
])
@ -2895,8 +2895,6 @@ def km_vertex_paint(params):
("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True},
{"properties": [("data_path", 'tool_settings.vertex_paint.brush.use_smooth_stroke')]}),
op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}),
("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'},
{"properties": [("data_path", 'tool_settings.vertex_paint.brush.stroke_method')]}),
op_panel("VIEW3D_PT_paint_vertex_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}),
])
@ -2913,15 +2911,13 @@ def km_weight_paint(params):
items.extend([
("paint.weight_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
("paint.weight_sample", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None),
("paint.weight_sample", {"type": 'I', "value": 'PRESS'}, None),
("paint.weight_sample_group", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, None),
("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
{"properties": [("scalar", 0.9)]}),
("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
{"properties": [("scalar", 1.0 / 0.9)]}),
*_template_paint_radial_control("weight_paint"),
("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'},
{"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')]}),
("wm.context_toggle", {"type": 'V', "value": 'PRESS'},