diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 11:22:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 11:27:07 +0300 |
commit | 9dbee5ccc23ff0ce2f7b9b198ab1c816f0a2b9dd (patch) | |
tree | b2cd51f2434de5fee7c518679db15e8bfd3091c4 /release/scripts/modules/bpy_extras | |
parent | 0f340a1fa2827d6426e5ac4c686ff1a1e0d4fa8e (diff) | |
parent | ceba8e28b7d1d00e9201fc626a8cd936893ea9d7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/modules/bpy_extras')
-rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 8 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils_experimental.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 7e5e1fb855c..6859e327b66 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -295,8 +295,10 @@ def _kmistr(kmi, is_modal): return "".join(s) -def keyconfig_export(wm, kc, filepath): - +def keyconfig_export( + wm, kc, filepath, *, + all_keymaps=False, +): f = open(filepath, "w") f.write("import bpy\n") @@ -326,7 +328,7 @@ def keyconfig_export(wm, kc, filepath): keymaps = [] edited_kc = FakeKeyConfig() for km in wm.keyconfigs.user.keymaps: - if km.is_user_modified: + if all_keymaps or km.is_user_modified: edited_kc.keymaps.append(km) # merge edited keymaps with non-default keyconfig, if it exists if kc != wm.keyconfigs.default: diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils_experimental.py b/release/scripts/modules/bpy_extras/keyconfig_utils_experimental.py index a0ea87d1c93..6e7b0205a65 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils_experimental.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils_experimental.py @@ -122,7 +122,7 @@ def _kmi_attrs_or_none(level, kmi): return "".join(lines) -def keyconfig_export_as_data(wm, kc, filepath): +def keyconfig_export_as_data(wm, kc, filepath, *, all_keymaps=False): # Alternate foramt # Generate a list of keymaps to export: @@ -140,7 +140,7 @@ def keyconfig_export_as_data(wm, kc, filepath): keymaps = [] edited_kc = FakeKeyConfig() for km in wm.keyconfigs.user.keymaps: - if km.is_user_modified: + if all_keymaps or km.is_user_modified: edited_kc.keymaps.append(km) # merge edited keymaps with non-default keyconfig, if it exists if kc != wm.keyconfigs.default: |