Revision: 44777
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44777
Author: nicholasbishop
Date: 2012-03-10 03:07:42 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
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.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35321
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-10
00:09:57 UTC (rev 44776)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-10
03:07:42 UTC (rev 44777)
@@ -3750,18 +3750,7 @@
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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
