[Bf-blender-cvs] [12ea90b] master: Fix T46201: Popup menu in post_load handler crash
Campbell Barton
noreply at git.blender.org
Tue Sep 22 04:34:07 CEST 2015
Commit: 12ea90b707d2ccac5960874eac83af057911320c
Author: Campbell Barton
Date: Tue Sep 22 12:23:24 2015 +1000
Branches: master
https://developer.blender.org/rB12ea90b707d2ccac5960874eac83af057911320c
Fix T46201: Popup menu in post_load handler crash
Match regular file loading logic for new-file operator.
===================================================================
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 6927e2d..41827ad 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -679,6 +679,8 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const c
BKE_undo_reset();
BKE_undo_write(C, "original"); /* save current state */
+ CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first);
+
ED_editors_init(C);
DAG_on_visible_update(CTX_data_main(C), true);
More information about the Bf-blender-cvs
mailing list