diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-17 23:25:41 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-17 23:25:41 +0300 |
commit | 510403277be6c5b34d01b386bfbf66871348f555 (patch) | |
tree | cb7a57d6f52fa6fc733993aa58e5b76fe34cf23e /source/blender/blenloader | |
parent | 6d9cda7aaaf117d8043dc850289254dbf1da01b4 (diff) | |
parent | 66d0d7e2dbd327988b7418f5ce1bd1cd4beb5927 (diff) |
Saturday merger of bf-blender in orange branch.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5c0843b1873..0cccf770fda 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5214,7 +5214,10 @@ BlendFileData *blo_read_file_internal(FileData *fd, BlendReadError *error_r) */ bhead = read_libblock(fd, fd->mainlist.last, bhead, LIB_READ+LIB_EXTERN, NULL); break; - + case ID_GR: + bhead = blo_nextbhead(fd, bhead); + break; + default: bhead = read_libblock(fd, bfd->main, bhead, LIB_LOCAL, NULL); } |