[Bf-blender-cvs] [70f0499] master: Fix for error reporting w/ a new-file
Campbell Barton
noreply at git.blender.org
Tue Sep 22 08:04:48 CEST 2015
Commit: 70f049913960adc3b6992052a3e71722b4151042
Author: Campbell Barton
Date: Tue Sep 22 15:56:03 2015 +1000
Branches: master
https://developer.blender.org/rB70f049913960adc3b6992052a3e71722b4151042
Fix for error reporting w/ a new-file
Reports are now initialized before reading startup.blend
===================================================================
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 a0ac945..1f5a276 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -174,6 +174,10 @@ void WM_init(bContext *C, int argc, const char **argv)
/* Enforce loading the UI for the initial homefile */
G.fileflags &= ~G_FILE_NO_UI;
+ /* reports cant be initialized before the wm,
+ * but keep before file reading, since that may report errors */
+ wm_init_reports(C);
+
/* get the default database, plus a wm */
wm_homefile_read(C, NULL, G.factory_startup, NULL);
@@ -229,8 +233,6 @@ void WM_init(bContext *C, int argc, const char **argv)
if (!G.background && !wm_start_with_console)
GHOST_toggleConsole(3);
- wm_init_reports(C); /* reports cant be initialized before the wm */
-
clear_matcopybuf();
ED_render_clear_mtex_copybuf();
More information about the Bf-blender-cvs
mailing list