blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

Fix generated toolbar keymap w/ annotation tool

This commit is contained in:
Campbell Barton 2019-01-07 11:00:46 +11:00
parent 8c0a77b894
commit 430cf7e15e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py
View File

@ -230,12 +230,19 @@ def generate(context, space_type):
kmi_first = km.keymap_items
kmi_first = kmi_first[0] if kmi_first else None
if kmi_first is not None:
kmi_found = wm.keyconfigs.find_item_from_operator(
idname=kmi_first.idname,
# properties=kmi_first.properties, # prevents matches, don't use.
context='INVOKE_REGION_WIN',
include={'KEYBOARD'},
)[1]
# We need 'MOUSE' so keys with 'key_modifier' are found.
for kmi_type in ('KEYBOARD', 'MOUSE'):
kmi_found = wm.keyconfigs.find_item_from_operator(
idname=kmi_first.idname,
# properties=kmi_first.properties, # prevents matches, don't use.
context='INVOKE_REGION_WIN',
include={kmi_type},
)[1]
if kmi_found is not None:
if (kmi_type == 'MOUSE') and (kmi_found.key_modifier == 'NONE'):
kmi_found = None
if kmi_found is not None:
break
else:
kmi_found = None
del kmi_first