Commit: d0ac13d6b14907a5260da548c879a9e891bec366
Author: Campbell Barton
Date: Thu Nov 22 16:33:11 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd0ac13d6b14907a5260da548c879a9e891bec366
Cleanup: minor simplification of keyconfig merge
===================================================================
M release/scripts/modules/bl_keymap_utils/io.py
===================================================================
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
