ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blender-v4.3-release'

Browse source
This commit is contained in:
Campbell Barton 2024-11-06 10:51:01 +11:00
commit 6fe8b5724a
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/modules/bl_keymap_utils/keymap_hierarchy.py
View file

@ -141,7 +141,6 @@ _km_hierarchy = [
('NLA Tracks', 'NLA_EDITOR', 'WINDOW', []),
('NLA Generic', 'NLA_EDITOR', 'WINDOW', []),
]),
('Timeline', 'TIMELINE', 'WINDOW', []),
('Image', 'IMAGE_EDITOR', 'WINDOW', [
# Image (reverse order, UVEdit before Image).

14
scripts/modules/bpy_extras/keyconfig_utils.py
View file

@ -70,6 +70,14 @@ def addon_keymap_unregister(keymap_data):
# Utility Functions
def keyconfig_test(kc):
from bl_keymap_utils.io import kmi_args_as_data
def _kmistr(kmi, is_modal):
if is_modal:
kmi_id = kmi.propvalue
else:
kmi_id = kmi.idname
return "{:s}({:s})".format(kmi_id, kmi_args_as_data(kmi))
def testEntry(kc, entry, src=None, parent=None):
result = False
@ -86,9 +94,9 @@ def keyconfig_test(kc):
for item in km.keymap_items:
if src.compare(item):
print("===========")
print(parent.name)
print(parent.name, "[parent]")
print(_kmistr(src, is_modal).strip())
print(km.name)
print(km.name, "[child]")
print(_kmistr(item, is_modal).strip())
result = True
@ -105,7 +113,7 @@ def keyconfig_test(kc):
item = km.keymap_items[j + i + 1]
if src.compare(item):
print("===========")
print(km.name)
print(km.name, "[self confict]")
print(_kmistr(src, is_modal).strip())
print(_kmistr(item, is_modal).strip())
result = True