[Bf-blender-cvs] [c2f2a8260c5] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Thu Oct 7 06:55:25 CEST 2021
Commit: c2f2a8260c58b6417e4bc457941434816f395dc6
Author: Joseph Eagar
Date: Wed Oct 6 18:33:08 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBc2f2a8260c58b6417e4bc457941434816f395dc6
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 534cb8fb209,b8b27b0e8ba..41c99de86ad
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -70,14 -71,13 +70,14 @@@ class Params
# (derived from other settings).
#
# This case needs to be checked often,
- # Shorthand for: `(params.use_fallback_tool if params.select_mouse ==
- # 'RIGHT' else False)`.
+ # Shorthand for: `(params.use_fallback_tool if params.select_mouse == 'RIGHTMOUSE' else False)`.
"use_fallback_tool_rmb",
- # Shorthand for: `('CLICK' if params.use_fallback_tool_rmb else params.select_mouse_value)`.
+ # Shorthand for: `('CLICK' if params.use_fallback_tool_rmb else
+ # params.select_mouse_value)`.
"select_mouse_value_fallback",
- # Shorthand for: `('CLICK_DRAG' if params.use_pie_click_drag else
- # 'PRESS')`
+ # Shorthand for: `{"type": params.select_tweak, "value": 'ANY'}`.
+ "select_tweak_event",
+ # Shorthand for: `('CLICK_DRAG' if params.use_pie_click_drag else 'PRESS')`
"pie_value",
# Shorthand for: `{"type": params.tool_tweak, "value": 'ANY'}`.
"tool_tweak_event",
@@@ -2482,11 -2813,20 +2477,18 @@@ def km_sequencer(params)
def km_sequencerpreview(params):
items = []
- keymap = (
- "SequencerPreview",
+ keymap = ("SequencerPreview",
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
- {"items": items},
- )
+ {"items": items},)
- items.extend([("sequencer.view_all_preview", {"type": 'HOME', "value": 'PRESS'}, None),
+ items.extend([
+ # Selection.
+ *_template_sequencer_preview_select(
+ type=params.select_mouse,
+ value=params.select_mouse_value_fallback,
+ legacy=params.legacy,
+ ),
+ ("sequencer.view_all_preview", {"type": 'HOME', "value": 'PRESS'}, None),
("sequencer.view_all_preview", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None),
("sequencer.view_ghost_border", {"type": 'O', "value": 'PRESS'}, None),
("sequencer.view_zoom_ratio", {"type": 'NUMPAD_8', "value": 'PRESS', "ctrl": True},
@@@ -2503,12 -2843,15 +2505,13 @@@
{"properties": [("ratio", 0.25)]}),
("sequencer.view_zoom_ratio", {"type": 'NUMPAD_8', "value": 'PRESS'},
{"properties": [("ratio", 0.125)]}),
- ("sequencer.sample", {"type": params.action_mouse, "value": 'PRESS'}, None),
- op_tool_optional(("transform.translate", {"type": 'G', "value": 'PRESS'}, None),
+ ("transform.translate", {"type": params.select_tweak, "value": 'ANY'}, None),
+ op_tool_optional(
+ ("transform.translate", {"type": 'G', "value": 'PRESS'}, None),
(op_tool_cycle, "builtin.move"), params),
- op_tool_optional(
- ("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
+ op_tool_optional(("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
(op_tool_cycle, "builtin.rotate"), params),
- op_tool_optional(
- ("transform.resize", {"type": 'S', "value": 'PRESS'}, None),
+ op_tool_optional(("transform.resize", {"type": 'S', "value": 'PRESS'}, None),
(op_tool_cycle, "builtin.scale"), params),
("sequencer.strip_transform_clear", {"type": 'G', "alt": True, "value": 'PRESS'},
{"properties": [("property", 'POSITION')]}),
@@@ -3756,9 -4314,10 +3761,9 @@@ def km_pose(params)
("pose.push", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),
("pose.relax", {"type": 'E', "value": 'PRESS', "alt": True}, None),
("pose.breakdown", {"type": 'E', "value": 'PRESS', "shift": True}, None),
- ("pose.blend_to_neighbour", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, None),
+ ("pose.blend_to_neighbor", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, None),
op_menu("VIEW3D_MT_pose_propagate", {"type": 'P', "value": 'PRESS', "alt": True}),
- *(
- (("object.hide_collection",
+ *((("object.hide_collection",
{"type": NUMBERS_1[i], "value": 'PRESS', "any": True},
{"properties": [("collection_index", i + 1)]})
for i in range(10)
@@@ -4070,20 -4627,81 +4075,76 @@@ def _template_uv_select(*, type, value
def _template_uv_select_for_fallback(params, fallback):
if (not fallback) and params.use_fallback_tool_rmb:
- # Needed so we have immediate select+tweak when the default select tool is active.
- return _template_uv_select(
- type=params.select_mouse,
+ # Needed so we have immediate select+tweak when the default select tool
+ # is active.
+ return _template_uv_select(type=params.select_mouse,
value=params.select_mouse_value,
- legacy=params.legacy,
- )
+ legacy=params.legacy,)
return []
-
+ def _template_sequencer_generic_select(*, type, value, legacy):
+ return [(
+ "sequencer.select",
+ {"type": type, "value": value, **{m: True for m in mods}},
+ {"properties": [(c, True) for c in props]},
+ ) for props, mods in (
+ (("deselect_all",) if not legacy else (), ()),
+ (("toggle",), ("shift",)),
+ )]
+
+
+ def _template_sequencer_preview_select(*, type, value, legacy):
+ return _template_sequencer_generic_select(
+ type=type, value=value, legacy=legacy,
+ ) + [(
+ "sequencer.select",
+ {"type": type, "value": value, **{m: True for m in mods}},
+ {"properties": [(c, True) for c in props]},
+ ) for props, mods in (
+ (("center",), ("ctrl",)),
+ # TODO:
+ # (("enumerate",), ("alt",)),
+ (("toggle", "center"), ("shift", "ctrl")),
+ # (("center", "enumerate"), ("ctrl", "alt")),
+ # (("toggle", "enumerate"), ("shift", "alt")),
+ # (("toggle", "center", "enumerate"), ("shift", "ctrl", "alt")),
+ )]
+
+
+ def _template_sequencer_timeline_select(*, type, value, legacy):
+ return _template_sequencer_generic_select(
+ type=type, value=value, legacy=legacy,
+ ) + [(
+ "sequencer.select",
+ {"type": type, "value": value, **{m: True for m in mods}},
+ {"properties": [(c, True) for c in props]},
+ ) for props, mods in (
+ (("linked_handle",), ("alt",)),
+ (("linked_handle", "extend"), ("shift", "alt",)),
+
+ (("side_of_frame", "linked_time"), ("ctrl",)),
+ (("side_of_frame", "linked_time", "extend"), ("ctrl", "shift")),
+ )]
+
+
+ def _template_sequencer_select_for_fallback(params, fallback):
+ if (not fallback) and params.use_fallback_tool_rmb:
+ # Needed so we have immediate select+tweak when the default select tool is active.
+ return _template_sequencer_generic_select(
+ type=params.select_mouse,
+ value=params.select_mouse_value,
+ legacy=params.legacy,
+ )
+ return []
+
+
def km_image_paint(params):
items = []
- keymap = (
- "Image Paint",
+ keymap = ("Image Paint",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
- {"items": items},
- )
+ {"items": items},)
- items.extend([
- ("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ items.extend([("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("mode", 'NORMAL')]}),
("paint.image_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'INVERT')]}),
@@@ -5397,33 -6223,45 +5458,41 @@@ def km_image_editor_tool_uv_select(para
def km_image_editor_tool_uv_select_box(params, *, fallback):
- return (
- _fallback_id("Image Editor Tool: Uv, Select Box", fallback),
+ return (_fallback_id("Image Editor Tool: Uv, Select Box", fallback),
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
- {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple("uv.select_box",
- # Don't use `tool_maybe_tweak_event`, see comment for this
- # slot.
- **({"type": params.select_tweak, "value": 'ANY'} if fallback else params.tool_tweak_event))),
- *_template_uv_select_for_fallback(params, fallback),]},)
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple(
+ "uv.select_box",
+ # Don't use `tool_maybe_tweak_event`, see comment for this slot.
+ **(params.select_tweak_event if fallback else params.tool_tweak_event))),
+ *_template_uv_select_for_fallback(params, fallback),
+ ]},
+ )
def km_image_editor_tool_uv_select_circle(params, *, fallback):
- return (
- _fallback_id("Image Editor Tool: Uv, Select Circle", fallback),
+ return (_fallback_id("Image Editor Tool: Uv, Select Circle", fallback),
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
- {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple("uv.select_circle",
- type=params.select_tweak if fallback else params.tool_mouse,
- value='ANY' if fallback else 'PRESS',
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple(
+ "uv.select_circle",
+ **(params.select_tweak_event if fallback else {"type": params.tool_mouse, "value": 'PRESS'}),
properties=[("wait_for_input", False)])),
# No selection fallback since this operates on press.
- ]},
- )
+ ]},)
def km_image_editor_tool_uv_select_lasso
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list