kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #20863: when loading a file without UI, with multiple windows open,

Browse Source 
the other windows would not preserve the screens correctly, code for
reading 2.4x files was running when it didn't need to.
This commit is contained in:
Brecht Van Lommel 2010-07-23 16:50:25 +00:00
parent 4c4ec56f49
commit bf5f5bd3bd
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/windowmanager/intern/wm_files.c
View File

@ -179,21 +179,23 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist)
/* we've read file without wm..., keep current one entirely alive */
if(G.main->wm.first==NULL) {
bScreen *screen= CTX_wm_screen(C);
/* match oldwm to new dbase, only old files */
for(wm= oldwmlist->first; wm; wm= wm->id.next) {
for(win= wm->windows.first; win; win= win->next) {
/* all windows get active screen from file */
if(screen->winid==0)
win->screen= screen;
else
win->screen= ED_screen_duplicate(win, screen);
/* when loading without UI, no matching needed */
if(!(G.fileflags & G_FILE_NO_UI)) {
bScreen *screen= CTX_wm_screen(C);
/* match oldwm to new dbase, only old files */
for(wm= oldwmlist->first; wm; wm= wm->id.next) {
BLI_strncpy(win->screenname, win->screen->id.name+2, 21);
win->screen->winid= win->winid;
for(win= wm->windows.first; win; win= win->next) {
/* all windows get active screen from file */
if(screen->winid==0)
win->screen= screen;
else
win->screen= ED_screen_duplicate(win, screen);
BLI_strncpy(win->screenname, win->screen->id.name+2, 21);
win->screen->winid= win->winid;
}
}
}