[Bf-blender-cvs] [f4dc4bd275f] blender2.8: Fix crash on startup in after recent G.main changes.
Brecht Van Lommel
noreply at git.blender.org
Thu Jun 14 13:46:39 CEST 2018
Commit: f4dc4bd275fd546c9d9084335adff7f4d1c62abe
Author: Brecht Van Lommel
Date: Thu Jun 14 13:44:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf4dc4bd275fd546c9d9084335adff7f4d1c62abe
Fix crash on startup in after recent G.main changes.
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 9c751da7b7b..81618468a04 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -472,7 +472,6 @@ void wm_file_read_report(bContext *C, Main *bmain)
*/
static void wm_file_read_post(bContext *C, const bool is_startup_file, const bool use_userdef)
{
- Main *bmain = CTX_data_main(C);
bool addons_loaded = false;
wmWindowManager *wm = CTX_wm_manager(C);
@@ -484,6 +483,8 @@ static void wm_file_read_post(bContext *C, const bool is_startup_file, const boo
CTX_wm_window_set(C, wm->windows.first);
ED_editors_init(C);
+
+ Main *bmain = CTX_data_main(C);
DEG_on_visible_update(bmain, true);
#ifdef WITH_PYTHON
More information about the Bf-blender-cvs
mailing list