From 3253ed9e26dd146d11f5bf9ff1a2dce3dbf744ec Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Fri, 26 Dec 2014 19:13:32 +0100 Subject: 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 --- source/blender/windowmanager/intern/wm_init_exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') 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); -- cgit v1.2.3