[Bf-blender-cvs] [1591c9a978c] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Thu Feb 24 05:59:34 CET 2022
Commit: 1591c9a978c08f8fd65924a4c5c8cfef4897f144
Author: Joseph Eagar
Date: Mon Feb 14 09:41:42 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB1591c9a978c08f8fd65924a4c5c8cfef4897f144
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc release/datafiles/locale
index 93612eddc7c,05005841745..2d12637a69d
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 93612eddc7cdfa82d1e7c31c362df0988388629b
-Subproject commit 050058417452bfba0cc9ae8692173eb02ac1ef3a
++Subproject commit 2d12637a69df7643484a8a3655b7eeb6faa170a7
diff --cc release/scripts/addons
index 9207696bbfa,faa9fc7f98e..089aef61deb
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9207696bbfac648c299f29f031ab5f18d8fa0077
-Subproject commit faa9fc7f98e19be54a715c24061185b04dff5b6c
++Subproject commit 089aef61debbece2baff6516e33fc7491629b1d0
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index d5dc0e950a2,5367d9b33f9..b115a644bdb
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -148,13 -160,10 +160,12 @@@ class Params
self.cursor_set_event = {"type": 'LEFTMOUSE', "value": 'CLICK'}
self.cursor_tweak_event = None
- self.use_fallback_tool = use_fallback_tool
self.tool_modifier = {}
else:
- # Left mouse select uses Click event for selection. This is a little
- # less immediate, but is needed to distinguish between click and tweak
+ # Left mouse select uses Click event for selection. This is a
+ # little
+ # less immediate, but is needed to distinguish between click and
+ # tweak
# events on the same mouse buttons.
self.select_mouse = 'LEFTMOUSE'
self.select_mouse_value = 'CLICK'
@@@ -1041,15 -1155,16 +1054,13 @@@ def km_outliner(params)
def km_uv_editor(params):
items = []
- keymap = (
- "UV Editor",
+ keymap = ("UV Editor",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
- {"items": items},
- )
+ {"items": items},)
- items.extend([
- # Selection modes.
+ items.extend([# Selection modes.
*_template_items_uv_select_mode(params),
- *_template_uv_select(type=params.select_mouse,
- value=('CLICK' if params.use_fallback_tool_rmb else params.select_mouse_value),
- legacy=params.legacy,),
+ *_template_uv_select(type=params.select_mouse, value=params.select_mouse_value_fallback, legacy=params.legacy),
("uv.mark_seam", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),
("uv.select_loop",
{"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, None),
@@@ -5658,32 -6287,44 +5669,40 @@@ 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.
- **(params.select_tweak_event if fallback else params.tool_tweak_event))),
+ {"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 and params.use_fallback_tool_select_mouse) else
+ params.tool_tweak_event))),
]},
)
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",
- **(params.select_tweak_event if fallback else {"type": params.tool_mouse, "value": '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 and params.use_fallback_tool_select_mouse) 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(params, *, fallback):
- return (
- _fallback_id("Image Editor Tool: Uv, Select Lasso", fallback),
+ return (_fallback_id("Image Editor Tool: Uv, Select Lasso", 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_lasso",
- **(params.select_tweak_event if fallback else params.tool_tweak_event))),
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple(
+ "uv.select_lasso",
+ **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else
+ params.tool_tweak_event))),
]},
)
@@@ -5818,24 -6494,29 +5840,25 @@@ def km_3d_view_tool_select(params, *, f
def km_3d_view_tool_select_box(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Select Box", fallback),
+ return (_fallback_id("3D View Tool: Select Box", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions("view3d.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))),
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions(
+ "view3d.select_box",
+ # Don't use `tool_maybe_tweak_event`, see comment for this slot.
+ **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else
+ params.tool_tweak_event))),
]},
)
def km_3d_view_tool_select_circle(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Select Circle", fallback),
+ return (_fallback_id("3D View Tool: Select Circle", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [
- *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple(
- "view3d.select_circle",
+ {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple("view3d.select_circle",
# Why circle select should be used on tweak?
- # So that RMB or Shift-RMB is still able to set an element as
- # active.
- type=params.select_tweak if fallback else params.tool_mouse,
+ # So that RMB or Shift-RMB is still able to set an element as active.
+ type=params.select_tweak if (fallback and params.use_fallback_tool_select_mouse) else params.tool_mouse,
value='ANY' if fallback else 'PRESS',
properties=[("wait_for_input", False)])),
]},
@@@ -5843,10 -6524,14 +5866,13 @@@
def km_3d_view_tool_select_lasso(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Select Lasso", fallback),
+ return (_fallback_id("3D View Tool: Select Lasso", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions("view3d.select_lasso",
- **(params.select_tweak_event if fallback else params.tool_tweak_event))),
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions(
+ "view3d.select_lasso",
+ **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else
+ params.tool_tweak_event))),
]}
)
@@@ -6469,24 -7406,29 +6495,25 @@@ def km_3d_view_tool_edit_gpencil_select
def km_3d_view_tool_edit_gpencil_select_box(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Edit Gpencil, Select Box", fallback),
+ return (_fallback_id("3D View Tool: Edit Gpencil, Select Box", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [*([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions("gpencil.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))),
+ {"items": [
+ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions(
+ "gpencil.select_box",
+ # Don't use `tool_maybe_tweak_event`, see comment for this slot.
+ **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else
+ params.tool_tweak_event))),
]},
)
def km_3d_view_tool_edit_gpencil_select_circle(params, *, fallback):
- return (
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list