diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
| commit | d9cf98573050fa10f586ed121f514986e688e609 (patch) | |
| tree | 6916742b8cb0b67387198592414d52860bf000cf /source/blender/blenloader | |
| parent | 9132754dc1ed77429a6e870c479b69ac8829d845 (diff) | |
| parent | b90535cc334bb8ae3a51f8023732b8c786019ac7 (diff) | |
Merging trunk up to r38329.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d47ff9ec410..171e291095a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4836,7 +4836,6 @@ static void lib_link_screen(FileData *fd, Main *main) else if(sl->spacetype==SPACE_FILE) { SpaceFile *sfile= (SpaceFile *)sl; sfile->files= NULL; - sfile->params= NULL; sfile->op= NULL; sfile->layout= NULL; sfile->folders_prev= NULL; @@ -5449,7 +5448,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc) sfile->files= NULL; sfile->layout= NULL; sfile->op= NULL; - sfile->params= NULL; + sfile->params= newdataadr(fd, sfile->params); } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 8acb91b64a0..d909f9f656c 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2106,7 +2106,11 @@ static void write_screens(WriteData *wd, ListBase *scrbase) writestruct(wd, DATA, "SpaceButs", 1, sl); } else if(sl->spacetype==SPACE_FILE) { + SpaceFile *sfile= (SpaceFile *)sl; + writestruct(wd, DATA, "SpaceFile", 1, sl); + if(sfile->params) + writestruct(wd, DATA, "FileSelectParams", 1, sfile->params); } else if(sl->spacetype==SPACE_SEQ) { writestruct(wd, DATA, "SpaceSeq", 1, sl); |