diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-26 21:13:32 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-26 21:14:01 +0300 |
| commit | 3253ed9e26dd146d11f5bf9ff1a2dce3dbf744ec (patch) | |
| tree | a56c99430de31fd8bad447cc721448c02dbc0527 /source | |
| parent | 6339ba1ee2b06174fa6e5157999b59e4e093ff1f (diff) | |
Put editor initialization before python.
Initially it was moved to allow setting keymaps of python defined menus
in C but looks like it breaks macro definition in python.
Thanks to Julian for tracking this down. It should fix T42485
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index d090eec4de7..1e100031f11 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -169,6 +169,8 @@ void WM_init(bContext *C, int argc, const char **argv) BLF_lang_set(NULL); + ED_spacemacros_init(); + /* note: there is a bug where python needs initializing before loading the * startup.blend because it may contain PyDrivers. It also needs to be after * initializing space types and other internal data. @@ -187,8 +189,6 @@ void WM_init(bContext *C, int argc, const char **argv) (void)argv; /* unused */ #endif - ED_spacemacros_init(); - if (!G.background && !wm_start_with_console) GHOST_toggleConsole(3); |