Merge branch 'blender-v3.2-release'
This commit is contained in:
commit
ae0b68e129
|
@ -6564,7 +6564,10 @@ def km_node_editor_tool_select(params, *, fallback):
|
|||
_fallback_id("Node Tool: Tweak", fallback),
|
||||
{"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'},
|
||||
{"items": [
|
||||
*([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else
|
||||
# The node key-map already selects, leave this empty.
|
||||
# NOTE: intentionally don't check `fallback` here (unlike other tweak tool checks).
|
||||
# as this should only be used on LMB select which would otherwise activate on click, not press.
|
||||
*([] if (params.select_mouse == 'RIGHTMOUSE') else
|
||||
_template_node_select(type=params.select_mouse, value='PRESS', select_passthrough=True)),
|
||||
]},
|
||||
)
|
||||
|
|
|
@ -445,7 +445,10 @@ bool WM_keymap_poll(bContext *C, wmKeyMap *keymap)
|
|||
* When developing a customized Blender though you may want empty keymaps. */
|
||||
if (!U.app_template[0] &&
|
||||
/* Fallback key-maps may be intentionally empty, don't flood the output. */
|
||||
!BLI_str_endswith(keymap->idname, " (fallback)")) {
|
||||
!BLI_str_endswith(keymap->idname, " (fallback)") &&
|
||||
/* This is an exception which may be empty.
|
||||
* Longer term we might want a flag to indicate an empty key-map is intended. */
|
||||
!STREQ(keymap->idname, "Node Tool: Tweak")) {
|
||||
CLOG_WARN(WM_LOG_KEYMAPS, "empty keymap '%s'", keymap->idname);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue