diff options
| author | Matt Ebb <matt@mke3.net> | 2009-05-30 08:24:10 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-05-30 08:24:10 +0400 |
| commit | 1422cb6e4594bb16b49fa3df36c6819a9bd0a41c (patch) | |
| tree | 5728f16d43241e3ab0478eb32d844ba9d057dd55 /source/blender/windowmanager | |
| parent | b36eb7e4522eab4f73a0b25a1c2c9130e17b7b5e (diff) | |
fix for previous commit, reload startup was freezing
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 283428394af..0e6681b134d 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -302,6 +302,9 @@ int WM_read_homefile(bContext *C, wmOperator *op) /* 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 @@ int WM_read_homefile(bContext *C, wmOperator *op) 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 */ |