diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-03 20:00:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-03 20:00:42 +0400 |
| commit | 245ab753f527722c15bc28498f778bf55f33bf99 (patch) | |
| tree | 743355814cd9f5d17fba3851dc723a893a8d8974 /release/scripts/ui/space_userpref_keymap.py | |
| parent | 0fdd003d9aa9c61bfd34feaaf86598632cfc3390 (diff) | |
misc uninteresting stuff (killing time at airport commit)
- pep8 updates
- RNA_TwoDFilterActuator --> RNA_Filter2DActuator
- minor changes to conolse namespace init.
Diffstat (limited to 'release/scripts/ui/space_userpref_keymap.py')
| -rw-r--r-- | release/scripts/ui/space_userpref_keymap.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index 4f440729e9d..961b138ab7e 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -92,7 +92,7 @@ KM_HIERARCHY = [ ]), ('Property Editor', 'PROPERTIES', 'WINDOW', []), # align context menu - + ('Script', 'SCRIPTS_WINDOW', 'WINDOW', []), ('Text', 'TEXT_EDITOR', 'WINDOW', []), ('Console', 'CONSOLE', 'WINDOW', []), @@ -107,19 +107,22 @@ KM_HIERARCHY = [ ('View3D Zoom Modal', 'EMPTY', 'WINDOW', []), ] + def _km_exists_in(km, export_keymaps): for km2, kc in export_keymaps: if km2.name == km.name: return True return False -# kc1 takes priority over kc2 + def _merge_keymaps(kc1, kc2): + """ note: kc1 takes priority over kc2 + """ merged_keymaps = [(km, kc1) for km in kc1.keymaps] if kc1 != kc2: merged_keymaps.extend([(km, kc2) for km in kc2.keymaps if not _km_exists_in(km, merged_keymaps)]) - - return merged_keymaps + + return merged_keymaps class InputKeyMapPanel(bpy.types.Panel): |