diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-11-27 20:58:46 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-11-27 20:58:46 +0300 |
| commit | 963b1f7f073e09fb04f29de55c5c698cc4e3cd57 (patch) | |
| tree | 40e96d6073f5dc349378ae7a678197dac733d7df /source/blender/windowmanager | |
| parent | d6aff38426a29af19230ee5badbda47ff4c0a306 (diff) | |
Bugfix: loading a .blend (via commandline now) while current config
had more windows, it left the non-active windows empty. The window-match
code is unfinished (need to bring all editors back), for now it just
follows rule to copy active screen in loaded file to other windows.
Also: added time marker icons (wrong location, view2d stuff still)
Also: bug in random green/purple area code, stopped at 10 subwindows :)
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 425c1f1acc5..b8a60710063 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -75,6 +75,8 @@ #include "BLO_writefile.h" #include "ED_datafiles.h" +#include "ED_screen.h" + #include "UI_interface.h" // XXX #include "BPY_extern.h" @@ -406,9 +408,10 @@ static void wm_window_match_do(bContext *C, ListBase *wmlist) for(wm= wmlist->first; wm; wm= wm->id.next) { for(win= wm->windows.first; win; win= win->next) { win->screen= (bScreen *)find_id("SR", win->screenname); - if(win->screen==NULL) - win->screen= C->screen; /* active screen */ + if(win->screen==NULL) + win->screen= ED_screen_duplicate(win, C->screen); /* active screen */ + if(win->screen->winid==0) win->screen->winid= win->winid; } |