diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-05 17:12:07 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-05 17:12:07 +0300 |
| commit | 465ff56d96a46e1dea60632ca271fe084fc8b644 (patch) | |
| tree | b63a449a0026e1562a51594eab83213755657782 /source/blender/blenloader | |
| parent | 283b0ff7360a45077b173b653833e6310fa6f4b5 (diff) | |
Orange: Ack! Yesterday's commit to cleanup relative paths forgot to
change the undo code as well... so on any Undo/redo all the libraries got
lost!
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 2c216f122cc..29650953641 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -116,6 +116,10 @@ BlendFileData* BLO_read_from_file (char *file, BlendReadError *error_r); */ BlendFileData* BLO_read_from_memory(void *mem, int memsize, BlendReadError *error_r); +/** + * file name is current file, only for retrieving library data */ + +BlendFileData *BLO_read_from_memfile(const char *filename, struct MemFile *memfile, BlendReadError *error_r); /** * Convert a BlendReadError to a human readable string. @@ -126,8 +130,6 @@ BlendFileData* BLO_read_from_memory(void *mem, int memsize, BlendReadError *erro * of @a error. */ -BlendFileData *BLO_read_from_memfile(struct MemFile *memfile, BlendReadError *error_r); - char* BLO_bre_as_string( BlendReadError error); diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index faff6b0b840..2da43013318 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -288,13 +288,14 @@ BlendFileData *BLO_read_from_memory(void *mem, int memsize, BlendReadError *erro return bfd; } -BlendFileData *BLO_read_from_memfile(MemFile *memfile, BlendReadError *error_r) +BlendFileData *BLO_read_from_memfile(const char *filename, MemFile *memfile, BlendReadError *error_r) { BlendFileData *bfd = NULL; FileData *fd; fd = blo_openblendermemfile(memfile, error_r); if (fd) { + strcpy(fd->filename, filename); bfd= blo_read_file_internal(fd, error_r); if (bfd) { bfd->type= BLENFILETYPE_BLEND; |