diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-10 07:07:42 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-10 07:07:42 +0400 |
| commit | b8f15a1dd3310fc5dcf1d1ade64ca726e4f08df3 (patch) | |
| tree | d3b5e27ce7e6795ec5f41acb980603046d5593e2 /source | |
| parent | 702e85ef849a2ad0a34ef0bd2d9f021e4a6e773f (diff) | |
Revert changes BMesh changes MDisp loading in readfile.c
These changes originated in r35321, which transfered MDisps to a
different memory allocator; this is no long used, however, so
post-merge it was just making an identical copy.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c16b0003d9b..517ba303a1a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3750,18 +3750,7 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte for(i = 0; i < count; ++i) { mdisps[i].disps = newdataadr(fd, mdisps[i].disps); - - /*put .disps into cellalloc system*/ - if (mdisps[i].disps) { - float *disp2; - - disp2 = MEM_mallocN(MEM_allocN_len(mdisps[i].disps), "cellalloc .disps copy"); - memcpy(disp2, mdisps[i].disps, MEM_allocN_len(mdisps[i].disps)); - - MEM_freeN(mdisps[i].disps); - mdisps[i].disps = (float (*)[3])disp2; - } - + if( (fd->flags & FD_FLAGS_SWITCH_ENDIAN) && (mdisps[i].disps) ) { /* DNA_struct_switch_endian doesn't do endian swap for (*disps)[] */ /* this does swap for data written at write_mdisps() - readfile.c */ |