diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-19 20:45:47 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-19 20:45:47 +0400 |
| commit | eac2042fc0218d6117ab6f0cacc7b121241a6033 (patch) | |
| tree | 24cb74fdd1249740130986bc1484f40f3b53d073 | |
| parent | 482630652b08ddac65a8e974956a8ed982fa6bea (diff) | |
Another patch for changes in file format...
- Since 2.50, the .blends have the current file name stored
- In versions up to 2.65.0 this didn't save for files saved from startup
(i.e. files saved without loading a file)
Code now adds the file name after all, except for recovery loads.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2a21fa49e42..acc0c009078 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6615,9 +6615,16 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead) bfd->globalf = fg->globalf; BLI_strncpy(bfd->filename, fg->filename, sizeof(bfd->filename)); - /* early 2.50 version patch - filename not in FileGlobal struct */ - if (fd->fileversion <= 250) - BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->main->name)); + /* error in 2.65 and older: main->name was not set if you save from startup (not after loading file) */ + if (bfd->filename[0] == 0) { + if (fd->fileversion < 265 || (fd->fileversion == 265 && fg->subversion < 1)) + if ((G.fileflags & G_FILE_RECOVER)==0) + BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename)); + + /* early 2.50 version patch - filename not in FileGlobal struct at all */ + if (fd->fileversion <= 250) + BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename)); + } if (G.fileflags & G_FILE_RECOVER) BLI_strncpy(fd->relabase, fg->filename, sizeof(fd->relabase)); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index c827d8c686b..557bdb8995b 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -672,7 +672,7 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) CLAMP(sv->vec.y, 0, winsizey); } -} + } /* test for collapsed areas. This could happen in some blender version... */ /* ton: removed option now, it needs Context... */ |