diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-31 21:52:15 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-31 21:52:15 +0300 |
| commit | 471fc0947987660ff500964f453a244593b62e52 (patch) | |
| tree | 1314a0321359ec6733e1b7c960210fdf6c356a32 /source/blender/blenkernel/intern | |
| parent | 0f93d129f43ce39f045b53a09c006c4993d7ccd7 (diff) | |
2.5
My last one for 2008: global undo/redo back :)
Happy 2009 all!
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 7b1406146a4..8adfe33dfe3 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -301,8 +301,9 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename) /* no load screens? */ if(mode) { /* comes from readfile.c */ - extern void lib_link_screen_restore(Main *, Scene *); + extern void lib_link_screen_restore(Main *, bScreen *, Scene *); + SWAP(ListBase, G.main->wm, bfd->main->wm); SWAP(ListBase, G.main->screen, bfd->main->screen); SWAP(ListBase, G.main->script, bfd->main->script); @@ -315,7 +316,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename) curscreen->scene= curscene; /* clear_global will free G.main, here we can still restore pointers */ - lib_link_screen_restore(bfd->main, curscene); + lib_link_screen_restore(bfd->main, curscreen, curscene); } /* free G.main Main database */ |