[Bf-blender-cvs] [f6b0194] blender-v2.76-release: Fix T46201: Popup menu in post_load handler crash

Campbell Barton noreply at git.blender.org
Wed Sep 23 16:12:14 CEST 2015


Commit: f6b01947469d9ac88e8e0b0646a30f263df2f00d
Author: Campbell Barton
Date:   Tue Sep 22 12:23:24 2015 +1000
Branches: blender-v2.76-release
https://developer.blender.org/rBf6b01947469d9ac88e8e0b0646a30f263df2f00d

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