[Bf-blender-cvs] [38c47e8c031] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Fri Oct 15 00:20:29 CEST 2021
Commit: 38c47e8c031c02d92f21a6868550e1366d80a57a
Author: Joseph Eagar
Date: Thu Oct 14 15:20:13 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB38c47e8c031c02d92f21a6868550e1366d80a57a
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc release/datafiles/locale
index 3d01b77226f,4833954c0ac..75e46177f36
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3d01b77226fcd99024ffaa0c12a6c14f22914d9f
-Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
++Subproject commit 75e46177f36a49ad36b917e641ee1586ddef7092
diff --cc release/scripts/addons
index e45804a3bb7,67f1fbca148..49d31b83def
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e45804a3bb753006b6aeeef78327359fc724633c
-Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
++Subproject commit 49d31b83def0231e7cfd2262f79031499d24580d
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 38d98a1d5c4,07f4a40e118..03fb87a1905
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -1874,10 -2142,12 +1877,10 @@@ def km_file_browser(params)
# Select file under cursor before spawning the context menu.
("file.select", {"type": 'RIGHTMOUSE', "value": 'PRESS'},
- {"properties": [
- ("open", False),
- ("only_activate_if_selected", params.select_mouse == 'LEFTMOUSE'), ("pass_through", True),
- ]}),
+ {"properties": [("open", False),
+ ("only_activate_if_selected", params.select_mouse == 'LEFTMOUSE'), ("pass_through", True),]}),
*_template_items_context_menu("FILEBROWSER_MT_context_menu", params.context_menu_event),
- *_template_items_context_menu("ASSETBROWSER_MT_context_menu", params.context_menu_event),])
+ ])
return keymap
@@@ -2474,14 -2816,20 +2479,16 @@@ 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([
- # Selection.
- *_template_sequencer_preview_select(
- type=params.select_mouse,
+ items.extend([# Selection.
+ *_template_sequencer_preview_select(type=params.select_mouse,
value=params.select_mouse_value_fallback,
- legacy=params.legacy,),
+ 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),
@@@ -2512,8 -2863,31 +2519,30 @@@
{"properties": [("property", 'SCALE')]}),
("sequencer.strip_transform_clear", {"type": 'R', "alt": True, "value": 'PRESS'},
{"properties": [("property", 'ROTATION')]}),
- *_template_items_context_menu("SEQUENCER_MT_preview_context_menu", params.context_menu_event),
- ])
+ *_template_items_context_menu("SEQUENCER_MT_preview_context_menu", params.context_menu_event),])
+ if not params.legacy:
+ # New pie menus.
+ items.extend([
+ ("wm.context_toggle", {"type": 'ACCENT_GRAVE', "value": 'PRESS', "ctrl": True},
+ {"properties": [("data_path", 'space_data.show_gizmo')]}),
+ op_menu_pie("SEQUENCER_MT_pivot_pie", {"type": 'PERIOD', "value": 'PRESS'}),
+ ("wm.context_toggle", {"type": 'Z', "value": 'PRESS', "alt": True, "shift": True},
+ {"properties": [("data_path", "space_data.overlay.show_overlays")]}),
+ ])
+
+ # 2D cursor.
+ if params.cursor_tweak_event:
+ items.extend([
+ ("sequencer.cursor_set", params.cursor_set_event, None),
+ ("transform.translate", params.cursor_tweak_event,
+ {"properties": [("release_confirm", True), ("cursor_transform", True)]}),
+ ])
+ else:
+ items.extend([
+ ("sequencer.cursor_set", params.cursor_set_event, None),
+ ])
+
return keymap
@@@ -6282,14 -7487,20 +6311,19 @@@ def km_3d_view_tool_sculpt_gpencil_sele
def km_sequencer_editor_tool_select(params, *, fallback):
- return (
- _fallback_id("Sequencer Tool: Tweak", fallback),
+ return (_fallback_id("Sequencer Tool: Tweak", fallback),
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
- {"items": [# TODO: Use 2D cursor for preview region (currently `sequencer.sample`).
+ {"items": [
*([] if fallback else
- _template_items_tool_select(params, "sequencer.select", "sequencer.sample", extend="toggle")),
- *([] if (not params.use_fallback_tool_rmb) else _template_sequencer_generic_select(type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
+ _template_items_tool_select(params, "sequencer.select", "sequencer.cursor_set", extend="toggle")
+ ),
+ *([] if (not params.use_fallback_tool_rmb) else _template_sequencer_generic_select(
+ type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
- *_template_items_change_frame(params),]},)
+ # Ignored for preview.
+ *_template_items_change_frame(params),
+ ]},
+ )
def km_sequencer_editor_tool_select_box(params, *, fallback):
@@@ -6302,24 -7516,50 +6336,38 @@@
*_template_sequencer_select_for_fallback(params, fallback),
# RMB select can already set the frame, match the tweak tool.
+ # Ignored for preview.
*(_template_items_change_frame(params)
- if params.select_mouse == 'LEFTMOUSE' else []),
- ]},
- )
+ if params.select_mouse == 'LEFTMOUSE' else []),]},)
def km_sequencer_editor_tool_generic_sample(params):
- return (
- "Sequencer Tool: Sample",
+ return ("Sequencer Tool: Sample",
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
- {"items": [
- ("sequencer.sample", {"type": params.tool_mouse, "value": 'PRESS'}, None),
- ]},
- )
+ {"items": [("sequencer.sample", {"type": params.tool_mouse, "value": 'PRESS'}, None),]},)
+ def km_sequencer_editor_tool_cursor(params):
+ return (
+ "Sequencer Tool: Cursor",
+ {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
+ {"items": [
+ ("sequencer.cursor_set", {"type": params.tool_mouse, "value": 'PRESS'}, None),
+ # Don't use `tool_maybe_tweak_event` since it conflicts with `PRESS` that places the cursor.
+ ("transform.translate", params.tool_tweak_event,
+ {"properties": [("release_confirm", True), ("cursor_transform", True)]}),
+ ]},
+ )
+
+
def km_sequencer_editor_tool_blade(_params):
- return (
- "Sequencer Tool: Blade",
+ return ("Sequencer Tool: Blade",
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
- {"items": [
- ("sequencer.split", {"type": 'LEFTMOUSE', "value": 'PRESS'},
- {"properties": [
- ("type", 'SOFT'),
+ {"items": [("sequencer.split", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ {"properties": [("type", 'SOFT'),
("side", 'NO_CHANGE'),
("use_cursor_position", True),
- ("ignore_selection", True),
- ]}),
- ]},
- )
+ ("ignore_selection", True),]}),]},)
def km_sequencer_editor_tool_move(params):
@@@ -6598,9 -7848,11 +6646,10 @@@ def generate_keymaps(params=None)
*(km_sequencer_editor_tool_select_box(params, fallback=fallback) for fallback in (False, True)),
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_move(params),
- ]
+ km_sequencer_editor_tool_move(params),]
# ------------------------------------------------------------------------------
# Refactoring (Testing Only)
diff --cc release/scripts/startup/bl_ui/properties_paint_common.py
index f853780f687,14aacf3a47a..d2f314c07b7
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@@ -2137,11 -1151,14 +2137,12 @@@ def brush_basic__draw_color_selector(co
if len(txt_ma) > maxw:
txt_ma = txt_ma[:maxw - 5] + '..' + txt_ma[-3:]
- sub = row.row()
+ sub = row.row(align=True)
+ sub.enabled = not gp_settings.use_material_pin
sub.ui_units_x = 8
- sub.popover(
- panel="TOPBAR_PT_gpencil_materials",
+ sub.popover(panel="TOPBAR_PT_gpencil_materials",
text=txt_ma,
- icon_value=icon_id,
- )
+ icon_value=icon_id,)
row.prop(gp_settings, "use_material_pin", text="")
diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index b4992dc4478,9b1b401bc5b..911733db756
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -2251,8 -2512,21 +2264,20 @@@ class _defs_sequencer_generic
icon="ops.transform.resize",
widget="SEQUENCER_GGT_gizmo2d_resize",
operator="transform.resize",
- keymap="Sequencer Tool: Scale",
- )
+ keymap="Sequencer Tool: Scale",)
+ @ToolDef.from_fn
+ def transform():
+ return dict(
+ idname="builtin.transform",
+ label="Transform",
+ description=(
+ "Supports any combination of grab, rotate, and scale at once"
+ ),
+ icon="ops.transform.transform",
+ widget="SEQUENCER_GGT_gizmo2d",
+ # No keymap default action, only for gizmo!
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list