[Bf-blender-cvs] [aa2a557] ui-preview-buttons: Fix crash when trying to use new preview system from py in addon's registration at startup.
Bastien Montagne
noreply at git.blender.org
Thu May 7 19:53:52 CEST 2015
Commit: aa2a557206bb62e857cabe8875daf91c717b75a7
Author: Bastien Montagne
Date: Thu May 7 19:53:08 2015 +0200
Branches: ui-preview-buttons
https://developer.blender.org/rBaa2a557206bb62e857cabe8875daf91c717b75a7
Fix crash when trying to use new preview system from py in addon's registration at startup.
Now call UI_init() before py stuff!
===================================================================
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index b5c267e..04dc397 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -171,6 +171,9 @@ void WM_init(bContext *C, int argc, const char **argv)
wm_homefile_read(C, NULL, G.factory_startup, NULL);
BLF_lang_set(NULL);
+ if (!G.background) {
+ UI_init();
+ }
ED_spacemacros_init();
@@ -204,8 +207,6 @@ void WM_init(bContext *C, int argc, const char **argv)
GPU_set_linear_mipmap(true);
GPU_set_anisotropic(U.anisotropic_filter);
GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
-
- UI_init();
}
clear_matcopybuf();
More information about the Bf-blender-cvs
mailing list