Commit: 472b1147610088de233948fcbd7ac4d992da3e36
Author: Campbell Barton
Date: Mon Nov 19 13:07:57 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB472b1147610088de233948fcbd7ac4d992da3e36
Fix keymap loading multiple times
Blender defaults data-file was loading it's own key-map
with a capital 'B', the preset would load it again w/ a lowercase name.
Use lowercase key-map names.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/windowmanager/intern/wm.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 18ee81977aa..bcda35dee59 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5901,9 +5901,3 @@ def generate_keymaps(params=None):
# Command to lint:
#
# pylint release/scripts/presets/keyconfig/keymap_data/blender_default.py
--disable=C0111,C0301,C0302,R0902,R0903,R0913
-
-
-if __name__ == "__main__":
- from bpy_extras.keyconfig_utils import keyconfig_import_from_data
- keyconfig_import_from_data("blender", generate_keymaps())
- keyconfig_import_from_data("blender_27",
generate_keymaps(Params(legacy=True)))
diff --git a/source/blender/windowmanager/intern/wm.c
b/source/blender/windowmanager/intern/wm.c
index 29a1252cf4b..06ae1e498b7 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -239,12 +239,16 @@ void WM_keyconfig_init(bContext *C)
wmWindowManager *wm = CTX_wm_manager(C);
/* create standard key configs */
- if (!wm->defaultconf)
- wm->defaultconf = WM_keyconfig_new(wm, "Blender", false);
- if (!wm->addonconf)
- wm->addonconf = WM_keyconfig_new(wm, "Blender Addon", false);
- if (!wm->userconf)
- wm->userconf = WM_keyconfig_new(wm, "Blender User", false);
+ if (wm->defaultconf == NULL) {
+ /* Keep lowercase to match the preset filename. */
+ wm->defaultconf = WM_keyconfig_new(wm, "blender", false);
+ }
+ if (wm->addonconf == NULL) {
+ wm->addonconf = WM_keyconfig_new(wm, "blender addon", false);
+ }
+ if (wm->userconf == NULL) {
+ wm->userconf = WM_keyconfig_new(wm, "blender user", false);
+ }
/* initialize only after python init is done, for keymaps that
* use python operators */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
