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:
authorCampbell Barton <ideasman42@gmail.com>2018-11-22 08:33:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-22 08:33:57 +0300
commitd0ac13d6b14907a5260da548c879a9e891bec366 (patch)
tree15ad9f1f49dd4dee6a12cfc45906943be23f26f9 /release/scripts/modules
parentea2d0f9a7a82e512744e81df0b4eabfae37b3870 (diff)
Cleanup: minor simplification of keyconfig merge
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/bl_keymap_utils/io.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/release/scripts/modules/bl_keymap_utils/io.py b/release/scripts/modules/bl_keymap_utils/io.py
index f53292b4802..7135d4bf7bd 100644
--- a/release/scripts/modules/bl_keymap_utils/io.py
+++ b/release/scripts/modules/bl_keymap_utils/io.py
@@ -267,14 +267,12 @@ def keyconfig_import_from_data(name, keyconfig_data):
def keyconfig_merge(kc1, kc2):
""" note: kc1 takes priority over kc2
"""
- def km_exists_in(km, export_keymaps):
- for km2, kc in export_keymaps:
- if km2.name == km.name:
- return True
- return False
-
+ kc1_names = {km.name for km in kc1.keymaps}
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))
-
+ merged_keymaps.extend(
+ (km, kc2)
+ for km in kc2.keymaps
+ if km.name not in kc1_names
+ )
return merged_keymaps