diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-20 20:43:25 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-20 20:43:25 +0400 |
commit | 5e5a38cdc3f4983eb17588fcaa1c4a44dbb20892 (patch) | |
tree | fbbb75fe52845d3b10ac28ba0b7321c398410d6a /source/blender/blenloader/intern/readblenentry.c | |
parent | 9a00cc55c170cfca5718d89fc8a2036fe05155b1 (diff) |
Bugfixes for quit.blend + library linking, the last commit didn't solve
that completely:
* quit.blend is saved from the undo file, which did not save out library
ID_LI and ID_ID blocks, for quick undo keeping the library datablocks.
However this means library links are lost on reading the quit.blend, so
now instead of not writing them, they are not read on undo.
* Libraries were not not using the right path yet always.
Note the screen setup is still not recovered from the quit.blend if no
auto save happened yet, but that is not important enough to spend time on
now.
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 3d21bb54e2b..7608f988f4f 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -364,7 +364,7 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil fd = blo_openblendermemfile(memfile, reports); if (fd) { fd->reports= reports; - strcpy(fd->filename, filename); + strcpy(fd->relabase, filename); /* clear ob->proxy_from pointers in old main */ blo_clear_proxy_pointers_from_lib(fd, oldmain); |