diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-07-25 22:35:49 +0400 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-07-25 22:35:49 +0400 |
| commit | cb988ff8a9c9df1d1e85c5ec1296857ffcb06dbd (patch) | |
| tree | 01dbc3837a0c8dfceaa1c25b47ddc3ec94314e40 /source/blender/blenloader/intern/readblenentry.c | |
| parent | dec3fa07f3b03e012d15fb8904a5eb12b12d3390 (diff) | |
- fix some error handling in blend loader, correct error codes
were not always returned.
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
| -rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 182bbe2f1a1..ceb226f67fb 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -163,7 +163,9 @@ int BLO_idcode_from_name(char *name) BlendHandle *BLO_blendhandle_from_file(char *file) { - return (BlendHandle*) blo_openblenderfile(file); + BlendReadError err; + + return (BlendHandle*) blo_openblenderfile(file, &err); } void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp) @@ -254,7 +256,7 @@ BlendFileData *BLO_read_from_file(char *file, BlendReadError *error_r) BlendFileData *bfd = NULL; FileData *fd; - fd = blo_openblenderfile(file); + fd = blo_openblenderfile(file, error_r); if (fd) { bfd= blo_read_file_internal(fd, error_r); if (bfd) { @@ -272,7 +274,7 @@ BlendFileData *BLO_read_from_memory(void *mem, int memsize, BlendReadError *erro BlendFileData *bfd = NULL; FileData *fd; - fd = blo_openblendermemory(mem, memsize); + fd = blo_openblendermemory(mem, memsize, error_r); if (fd) { bfd= blo_read_file_internal(fd, error_r); if (bfd) { @@ -290,7 +292,7 @@ BlendFileData *BLO_read_from_memfile(MemFile *memfile, BlendReadError *error_r) BlendFileData *bfd = NULL; FileData *fd; - fd = blo_openblendermemfile(memfile); + fd = blo_openblendermemfile(memfile, error_r); if (fd) { bfd= blo_read_file_internal(fd, error_r); if (bfd) { |