diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 15:01:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 15:01:44 +0300 |
| commit | 7a76bc9a361e6cb45e4292c0ac5c7bb08936b829 (patch) | |
| tree | d94c3deb3377902cb5adf8c807372cf491608bff /source/blender/windowmanager/intern/wm.c | |
| parent | e8ddcfa06dbdef68e9329734bb2c6fdbdf1f01ae (diff) | |
Fix #20886: user defined keymap could be loaded before python scripts,
printing errors when that keymap included python operators.
Diffstat (limited to 'source/blender/windowmanager/intern/wm.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 7f4bb59bbae..bd26a94c917 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -190,11 +190,10 @@ void WM_keymap_init(bContext *C) /* create default key config */ wm_window_keymap(wm->defaultconf); ED_spacetypes_keymap(wm->defaultconf); + WM_keyconfig_userdef(wm); wm->initialized |= WM_INIT_KEYMAP; } - - WM_keyconfig_userdef(wm); } void WM_check(bContext *C) |