[Bf-blender-cvs] [49054a7109d] tracking_tools: Merge branch 'master' into tracking_tools
Sebastian Koenig
noreply at git.blender.org
Wed Sep 22 11:50:07 CEST 2021
Commit: 49054a7109d1816a8ecd1c9bd02af1adf8034096
Author: Sebastian Koenig
Date: Wed Sep 22 11:49:07 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB49054a7109d1816a8ecd1c9bd02af1adf8034096
Merge branch 'master' into tracking_tools
===================================================================
===================================================================
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 4127999a554,0ea3c1882c9..a040282d59a
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -1383,16 -1456,11 +1456,11 @@@ def km_mask_editing(params)
{"properties": [("mode", 'SUB')]}),
("mask.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None),
("mask.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None),
- ("mask.hide_view_clear", {"type": 'H', "value": 'PRESS', "alt": True}, None),
- ("mask.hide_view_set", {"type": 'H', "value": 'PRESS'},
- {"properties": [("unselected", False)]}),
- ("mask.hide_view_set", {"type": 'H', "value": 'PRESS', "shift": True},
- {"properties": [("unselected", True)]}),
- ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
- {"properties": [("extend", False)]}),
+ *_template_items_hide_reveal_actions("mask.hide_view_set", "mask.hide_view_clear"),
+ ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, None),
("mask.cyclic_toggle", {"type": 'C', "value": 'PRESS', "alt": True}, None),
- ("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
- ("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+ # ("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+ # ("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
("mask.handle_type_set", {"type": 'V', "value": 'PRESS'}, None),
("mask.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None),
("mask.parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None),
@@@ -6018,63 -6117,15 +6190,65 @@@ def km_image_editor_tool_uv_scale(param
)
+def km_clip_editor_tool_select(params):
+ return (
+ "Clip Editor: Tweak",
+ {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
+ {"items": [
+ ("clip.select", {"type": params.select_mouse, "value": 'PRESS'},
+ {"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
+ ]},
+ )
+
+
+def km_clip_editor_tool_select_box(params):
+ return (
+ "Clip Editor: Select Box",
+ {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
+ {"items": _template_items_tool_select_actions_simple(
+ "clip.select_box", type=params.tool_tweak, value='ANY',
+ )},
+ )
+
+def km_clip_editor_tool_select_lasso(params):
+ return (
+ "Clip Editor: Select Lasso",
+ {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
+ {"items": _template_items_tool_select_actions_simple(
+ "clip.select_lasso", type=params.tool_mouse, value='PRESS',
+ )},
+ )
+
+def km_clip_editor_tool_select_circle(params):
+ return (
+ "Clip Editor: Select Circle",
+ {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
+ {"items": _template_items_tool_select_actions_simple(
+ "clip.select_circle", type=params.tool_mouse, value='PRESS',
+ properties=[("wait_for_input", False)],
+ )},
+ )
+
+def km_clip_editor_tool_add_marker_tweak(params):
+ return (
+ "Clip Editor: Add Marker and Tweak",
+ {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
+ {"items": [
+ ("clip.add_marker_slide", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None),
+ ("clip.slide_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+ ("clip.slide_plane_marker", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG'}, None),
+ ]},
+ )
+
- def km_node_editor_tool_select(params):
+ def km_node_editor_tool_select(params, *, fallback):
return (
- "Node Tool: Tweak",
+ _fallback_id("Node Tool: Tweak", fallback),
{"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'},
{"items": [
- ("node.select", {"type": params.select_mouse, "value": 'PRESS'},
- {"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
+ *([] if fallback else [
+ ("node.select", {"type": params.select_mouse, "value": 'PRESS'},
+ {"properties": [("deselect_all", not params.legacy)]}),
+ ]),
]},
)
@@@ -7328,40 -7479,27 +7602,40 @@@ def generate_keymaps(params=None)
km_generic_tool_annotate_polygon(params),
km_generic_tool_annotate_eraser(params),
+ km_generic_tool_mask_select(params),
+ km_generic_tool_mask_select_box(params),
+ km_generic_tool_mask_select_lasso(params),
+ km_generic_tool_mask_select_circle(params),
+ km_generic_tool_mask_add_vertex(params),
+ km_generic_tool_mask_add_feather_vertex(params),
+ km_generic_tool_mask_delete_vertex(params),
+
km_image_editor_tool_generic_sample(params),
km_image_editor_tool_uv_cursor(params),
- km_image_editor_tool_uv_select(params),
- km_image_editor_tool_uv_select_box(params),
- km_image_editor_tool_uv_select_circle(params),
- km_image_editor_tool_uv_select_lasso(params),
+ *(km_image_editor_tool_uv_select(params, fallback=fallback) for fallback in (False, True)),
+ *(km_image_editor_tool_uv_select_box(params, fallback=fallback) for fallback in (False, True)),
+ *(km_image_editor_tool_uv_select_circle(params, fallback=fallback) for fallback in (False, True)),
+ *(km_image_editor_tool_uv_select_lasso(params, fallback=fallback) for fallback in (False, True)),
km_image_editor_tool_uv_rip_region(params),
km_image_editor_tool_uv_sculpt_stroke(params),
km_image_editor_tool_uv_move(params),
km_image_editor_tool_uv_rotate(params),
+ km_clip_editor_tool_select(params),
+ km_clip_editor_tool_select_box(params),
+ km_clip_editor_tool_select_lasso(params),
+ km_clip_editor_tool_select_circle(params),
+ km_clip_editor_tool_add_marker_tweak(params),
km_image_editor_tool_uv_scale(params),
- km_node_editor_tool_select(params),
- km_node_editor_tool_select_box(params),
- km_node_editor_tool_select_lasso(params),
- km_node_editor_tool_select_circle(params),
+ *(km_node_editor_tool_select(params, fallback=fallback) for fallback in (False, True)),
+ *(km_node_editor_tool_select_box(params, fallback=fallback) for fallback in (False, True)),
+ *(km_node_editor_tool_select_lasso(params, fallback=fallback) for fallback in (False, True)),
+ *(km_node_editor_tool_select_circle(params, fallback=fallback) for fallback in (False, True)),
km_node_editor_tool_links_cut(params),
km_3d_view_tool_cursor(params),
- km_3d_view_tool_select(params),
- km_3d_view_tool_select_box(params),
- km_3d_view_tool_select_circle(params),
- km_3d_view_tool_select_lasso(params),
+ *(km_3d_view_tool_select(params, fallback=fallback) for fallback in (False, True)),
+ *(km_3d_view_tool_select_box(params, fallback=fallback) for fallback in (False, True)),
+ *(km_3d_view_tool_select_circle(params, fallback=fallback) for fallback in (False, True)),
+ *(km_3d_view_tool_select_lasso(params, fallback=fallback) for fallback in (False, True)),
km_3d_view_tool_transform(params),
km_3d_view_tool_move(params),
km_3d_view_tool_rotate(params),
More information about the Bf-blender-cvs
mailing list