diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-03 22:38:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-03 22:38:52 +0400 |
| commit | 579b8ef6e52255ff89ce62756709217fe68f596a (patch) | |
| tree | a01502f54762fe99dbcf2829af8b78d514c7ba74 | |
| parent | 9250ab0619387d80964c64738334e437a92c25cf (diff) | |
2.5: fix missing LIB_NEEDLINK check in windowmanager reading,
would cause crash with linking/appending.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 64fabc825bc..0231d841c2b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4355,11 +4355,14 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm) static void lib_link_windowmanager(FileData *fd, Main *main) { wmWindowManager *wm; + wmWindow *win; for(wm= main->wm.first; wm; wm= wm->id.next) { - wmWindow *win; - for(win= wm->windows.first; win; win= win->next) { - win->screen= newlibadr(fd, NULL, win->screen); + if(wm->id.flag & LIB_NEEDLINK) { + for(win= wm->windows.first; win; win= win->next) + win->screen= newlibadr(fd, NULL, win->screen); + + wm->id.flag -= LIB_NEEDLINK; } } } |