[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20513] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_files.c: fix for previous commit, reload startup was freezing
Matt Ebb
matt at mke3.net
Sat May 30 06:24:10 CEST 2009
Revision: 20513
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20513
Author: broken
Date: 2009-05-30 06:24:10 +0200 (Sat, 30 May 2009)
Log Message:
-----------
fix for previous commit, reload startup was freezing
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c 2009-05-30 04:16:24 UTC (rev 20512)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c 2009-05-30 04:24:10 UTC (rev 20513)
@@ -302,6 +302,9 @@
/* prevent loading no UI */
G.fileflags &= ~G_FILE_NO_UI;
+ if (from_memory)
+ wm_clear_default_size(C);
+
/* put aside screens to match with persistant windows later */
wm_window_match_init(C, &wmbase);
@@ -309,7 +312,6 @@
success = BKE_read_file(C, tstr, NULL, NULL);
} else {
success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL, NULL);
- wm_clear_default_size(C);
}
/* match the read WM with current WM */
More information about the Bf-blender-cvs
mailing list