archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5

Browse Source 
My last one for 2008: global undo/redo back :)
Happy 2009 all!
This commit is contained in:
Ton Roosendaal
2008-12-31 18:52:15 +00:00
parent 0f93d129f4
commit 471fc09479
5 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/blender.c
View File

@@ -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 */