Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
99fbf1716f
|
@ -6168,7 +6168,7 @@ def km_popup_toolbar(_params):
|
|||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System Keymaps
|
||||
# Tool System (Generic)
|
||||
#
|
||||
# Named are auto-generated based on the tool name and it's toolbar.
|
||||
|
||||
|
@ -6234,6 +6234,9 @@ def km_image_editor_tool_generic_sample(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (UV Editor)
|
||||
|
||||
def km_image_editor_tool_uv_cursor(params):
|
||||
return (
|
||||
"Image Editor Tool: Uv, Cursor",
|
||||
|
@ -6362,6 +6365,9 @@ def km_image_editor_tool_uv_scale(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (Node Editor)
|
||||
|
||||
def km_node_editor_tool_select(params, *, fallback):
|
||||
return (
|
||||
_fallback_id("Node Tool: Tweak", fallback),
|
||||
|
@ -6428,6 +6434,9 @@ def km_node_editor_tool_links_cut(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Generic)
|
||||
|
||||
def km_3d_view_tool_cursor(params):
|
||||
return (
|
||||
"3D View Tool: Cursor",
|
||||
|
@ -6571,6 +6580,9 @@ def km_3d_view_tool_measure(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Pose Mode)
|
||||
|
||||
def km_3d_view_tool_pose_breakdowner(params):
|
||||
return (
|
||||
"3D View Tool: Pose, Breakdowner",
|
||||
|
@ -6601,6 +6613,9 @@ def km_3d_view_tool_pose_relax(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Edit Armature)
|
||||
|
||||
def km_3d_view_tool_edit_armature_roll(params):
|
||||
return (
|
||||
"3D View Tool: Edit Armature, Roll",
|
||||
|
@ -6656,6 +6671,9 @@ def km_3d_view_tool_edit_armature_extrude_to_cursor(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Object Mode)
|
||||
|
||||
def km_3d_view_tool_interactive_add(params):
|
||||
return (
|
||||
"3D View Tool: Object, Add Primitive",
|
||||
|
@ -6672,6 +6690,9 @@ def km_3d_view_tool_interactive_add(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Edit Mesh)
|
||||
|
||||
def km_3d_view_tool_edit_mesh_extrude_region(params):
|
||||
return (
|
||||
"3D View Tool: Edit Mesh, Extrude Region",
|
||||
|
@ -6938,6 +6959,9 @@ def km_3d_view_tool_edit_mesh_rip_edge(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Edit Curve)
|
||||
|
||||
def km_3d_view_tool_edit_curve_draw(params):
|
||||
return (
|
||||
"3D View Tool: Edit Curve, Draw",
|
||||
|
@ -7005,6 +7029,9 @@ def km_3d_view_tool_edit_curve_extrude_to_cursor(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Sculpt)
|
||||
|
||||
def km_3d_view_tool_sculpt_box_hide(params):
|
||||
return (
|
||||
"3D View Tool: Sculpt, Box Hide",
|
||||
|
@ -7160,6 +7187,9 @@ def km_3d_view_tool_sculpt_face_set_edit(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Weight Paint)
|
||||
|
||||
def km_3d_view_tool_paint_weight_sample_weight(params):
|
||||
return (
|
||||
"3D View Tool: Paint Weight, Sample Weight",
|
||||
|
@ -7190,6 +7220,9 @@ def km_3d_view_tool_paint_weight_gradient(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Grease Pencil, Paint)
|
||||
|
||||
def km_3d_view_tool_paint_gpencil_line(params):
|
||||
return (
|
||||
"3D View Tool: Paint Gpencil, Line",
|
||||
|
@ -7324,6 +7357,9 @@ def km_3d_view_tool_paint_gpencil_interpolate(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Grease Pencil, Edit)
|
||||
|
||||
def km_3d_view_tool_edit_gpencil_select(params, *, fallback):
|
||||
return (
|
||||
_fallback_id("3D View Tool: Edit Gpencil, Tweak", fallback),
|
||||
|
@ -7459,6 +7495,9 @@ def km_3d_view_tool_edit_gpencil_interpolate(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (3D View, Grease Pencil, Sculpt)
|
||||
|
||||
def km_3d_view_tool_sculpt_gpencil_select(params):
|
||||
return (
|
||||
"3D View Tool: Sculpt Gpencil, Tweak",
|
||||
|
@ -7494,7 +7533,10 @@ def km_3d_view_tool_sculpt_gpencil_select_lasso(params):
|
|||
)
|
||||
|
||||
|
||||
def km_sequencer_editor_tool_select(params, *, fallback):
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (Sequencer, Generic)
|
||||
|
||||
def km_sequencer_editor_tool_generic_select(params, *, fallback):
|
||||
return (
|
||||
_fallback_id("Sequencer Tool: Tweak", fallback),
|
||||
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
|
||||
|
@ -7510,7 +7552,7 @@ def km_sequencer_editor_tool_select(params, *, fallback):
|
|||
)
|
||||
|
||||
|
||||
def km_sequencer_editor_tool_select_box(params, *, fallback):
|
||||
def km_sequencer_editor_tool_generic_select_box(params, *, fallback):
|
||||
return (
|
||||
_fallback_id("Sequencer Tool: Select Box", fallback),
|
||||
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
|
||||
|
@ -7529,17 +7571,7 @@ def km_sequencer_editor_tool_select_box(params, *, fallback):
|
|||
)
|
||||
|
||||
|
||||
def km_sequencer_editor_tool_generic_sample(params):
|
||||
return (
|
||||
"Sequencer Tool: Sample",
|
||||
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
|
||||
{"items": [
|
||||
("sequencer.sample", {"type": params.tool_mouse, "value": 'PRESS'}, None),
|
||||
]},
|
||||
)
|
||||
|
||||
|
||||
def km_sequencer_editor_tool_cursor(params):
|
||||
def km_sequencer_editor_tool_generic_cursor(params):
|
||||
return (
|
||||
"Sequencer Tool: Cursor",
|
||||
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
|
||||
|
@ -7552,6 +7584,9 @@ def km_sequencer_editor_tool_cursor(params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (Sequencer, Timeline)
|
||||
|
||||
def km_sequencer_editor_tool_blade(_params):
|
||||
return (
|
||||
"Sequencer Tool: Blade",
|
||||
|
@ -7568,6 +7603,19 @@ def km_sequencer_editor_tool_blade(_params):
|
|||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Tool System (Sequencer, Preview)
|
||||
|
||||
def km_sequencer_editor_tool_sample(params):
|
||||
return (
|
||||
"Sequencer Tool: Sample",
|
||||
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
|
||||
{"items": [
|
||||
("sequencer.sample", {"type": params.tool_mouse, "value": 'PRESS'}, None),
|
||||
]},
|
||||
)
|
||||
|
||||
|
||||
def km_sequencer_editor_tool_move(params):
|
||||
return (
|
||||
"Sequencer Tool: Move",
|
||||
|
@ -7850,14 +7898,14 @@ def generate_keymaps(params=None):
|
|||
km_3d_view_tool_sculpt_gpencil_select_box(params),
|
||||
km_3d_view_tool_sculpt_gpencil_select_circle(params),
|
||||
km_3d_view_tool_sculpt_gpencil_select_lasso(params),
|
||||
*(km_sequencer_editor_tool_select(params, fallback=fallback) for fallback in (False, True)),
|
||||
*(km_sequencer_editor_tool_select_box(params, fallback=fallback) for fallback in (False, True)),
|
||||
*(km_sequencer_editor_tool_generic_select(params, fallback=fallback) for fallback in (False, True)),
|
||||
*(km_sequencer_editor_tool_generic_select_box(params, fallback=fallback) for fallback in (False, True)),
|
||||
km_sequencer_editor_tool_generic_cursor(params),
|
||||
km_sequencer_editor_tool_blade(params),
|
||||
km_sequencer_editor_tool_generic_sample(params),
|
||||
km_sequencer_editor_tool_cursor(params),
|
||||
km_sequencer_editor_tool_scale(params),
|
||||
km_sequencer_editor_tool_rotate(params),
|
||||
km_sequencer_editor_tool_sample(params),
|
||||
km_sequencer_editor_tool_move(params),
|
||||
km_sequencer_editor_tool_rotate(params),
|
||||
km_sequencer_editor_tool_scale(params),
|
||||
]
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue