Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2011-07-22 01:43:42 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2011-07-22 01:43:42 +0400
commit32004f11aaca7d52de2eaaf319dc0ed11b1bb5ff (patch)
tree56e5f4651f1ed1e6b4969ec9ddb98f6df5f5fdf0 /release
parent407a2a8439f61922139a3c5d1607818234924fe1 (diff)
Keymap editor now understands NDOF (button) events too.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref_keymap.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py
index 85764c55304..8faf1afab63 100644
--- a/release/scripts/startup/bl_ui/space_userpref_keymap.py
+++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py
@@ -271,6 +271,8 @@ class InputKeyMapPanel:
row.prop(kmi, "type", text="", full_event=True)
elif map_type == 'MOUSE':
row.prop(kmi, "type", text="", full_event=True)
+ if map_type == 'NDOF':
+ row.prop(kmi, "type", text="", full_event=True)
elif map_type == 'TWEAK':
subrow = row.row()
subrow.prop(kmi, "type", text="")
@@ -306,7 +308,7 @@ class InputKeyMapPanel:
sub = split.column()
subrow = sub.row(align=True)
- if map_type == 'KEYBOARD':
+ if map_type in ('KEYBOARD', 'NDOF'):
subrow.prop(kmi, "type", text="", event=True)
subrow.prop(kmi, "value", text="")
elif map_type == 'MOUSE':