[Bf-blender-cvs] [dc21ef7b86c] blender2.8: Fix 'Load Factory Settings' loosing the keymap

Campbell Barton noreply at git.blender.org
Sat Nov 10 01:06:11 CET 2018


Commit: dc21ef7b86ca612e1ad7b5a64e1fdb474bd6bbe6
Author: Campbell Barton
Date:   Sat Nov 10 11:04:32 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBdc21ef7b86ca612e1ad7b5a64e1fdb474bd6bbe6

Fix 'Load Factory Settings' loosing the keymap

Caused by recent move to Python based keymaps.

===================================================================

M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 318147e8c25..f7971ed1b64 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -511,6 +511,13 @@ static void wm_file_read_post(bContext *C, const bool is_startup_file, const boo
 			}
 			BPY_python_reset(C);
 			addons_loaded = true;
+
+			if (!G.background) {
+				/* Load the keymap from Python, otherwise we get an empty keymap. */
+				BPY_execute_string(
+				        C, (const char *[]){"bpy", NULL},
+				        "bpy.utils.keyconfig_set(bpy.utils.preset_find('blender', 'keyconfig'))");
+			}
 		}
 	}
 	else {



More information about the Bf-blender-cvs mailing list