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

2.5: fix for crash reading regions of inactive spaces in an area.

Browse Source
This commit is contained in:
Brecht Van Lommel
2008-12-19 00:18:16 +00:00
parent 9178dc8596
commit dfb8b21340
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenloader/intern/readfile.c
View File

@@ -4143,6 +4143,15 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene)
}
}
static void direct_link_region(FileData *fd, ARegion *ar)
{
ar->handlers.first= ar->handlers.last= NULL;
ar->uiblocks.first= ar->uiblocks.last= NULL;
ar->regiondata= NULL;
ar->swinid= 0;
ar->type= NULL;
}
static void direct_link_screen(FileData *fd, bScreen *sc)
{
ScrArea *sa;
@@ -4212,6 +4221,11 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
}
for (sl= sa->spacedata.first; sl; sl= sl->next) {
link_list(fd, &(sl->regionbase));
for(ar= sl->regionbase.first; ar; ar= ar->next)
direct_link_region(fd, ar);
if (sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D*) sl;
v3d->bgpic= newdataadr(fd, v3d->bgpic);
@@ -4275,13 +4289,8 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
}
}
for(ar= sa->regionbase.first; ar; ar= ar->next) {
ar->handlers.first= ar->handlers.last= NULL;
ar->uiblocks.first= ar->uiblocks.last= NULL;
ar->regiondata= NULL;
ar->swinid= 0;
ar->type= NULL;
}
for(ar= sa->regionbase.first; ar; ar= ar->next)
direct_link_region(fd, ar);
sa->actionzones.first= sa->actionzones.last= NULL;

3
source/blender/blenloader/intern/writefile.c
View File

@@ -1651,6 +1651,9 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
sl= sa->spacedata.first;
while(sl) {
for(ar= sl->regionbase.first; ar; ar= ar->next)
writestruct(wd, DATA, "ARegion", 1, ar);
if(sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D *) sl;
writestruct(wd, DATA, "View3D", 1, v3d);