diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-12 16:53:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-13 20:22:07 +0300 |
| commit | 7aae28af2d7dd9d593c4208d8c73d06d9e274044 (patch) | |
| tree | eee275d3771c0c941f2c08576493f6406fee2a22 /source/blender/windowmanager/intern/wm_files.c | |
| parent | fe4df40f3086d7fc135e17a15e0c4060f6b66dae (diff) | |
Keymaps: refactor loading of default keymap, fix bugs.
This refactors loading of key configurations to clear and refill existing
ones, rather than adding a new one and then removing the old one.
This fixes broken loading of non-default configurations after recent changes,
and prepares for future changes to make it possible to dynamically change
key configurations based on user preferences.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index f7971ed1b64..318147e8c25 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -511,13 +511,6 @@ 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 { |