[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21046] branches/blender2.5/blender/source /blender: 2.5/Multires:

[Nicholas Bishop]

Revision: 21046
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21046
Author:   nicholasbishop
Date:     2009-06-21 04:51:42 +0200 (Sun, 21 Jun 2009)

Log Message:
-----------
2.5/Multires:

Bugfix for loading older files with the pre-modifier multires.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c	2009-06-21 02:03:50 UTC (rev 21045)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c	2009-06-21 02:51:42 UTC (rev 21046)
@@ -1270,8 +1270,10 @@
 		if(lvl) {
 			CustomData_free(&mr->vdata, lvl->totvert);
 			CustomData_free(&mr->fdata, lvl->totface);
-			MEM_freeN(mr->edge_flags);
-			MEM_freeN(mr->edge_creases);
+			if(mr->edge_flags)
+				MEM_freeN(mr->edge_flags);
+			if(mr->edge_creases)
+				MEM_freeN(mr->edge_creases);
 		}
 
 		while(lvl) {

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-06-21 02:03:50 UTC (rev 21045)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-06-21 02:51:42 UTC (rev 21046)
@@ -3142,10 +3142,8 @@
 		direct_link_dverts(fd, lvl->totvert, CustomData_get(&mesh->mr->vdata, 0, CD_MDEFORMVERT));
 		direct_link_customdata(fd, &mesh->mr->fdata, lvl->totface);
 		
-		if(!mesh->mr->edge_flags)
-			mesh->mr->edge_flags= MEM_callocN(sizeof(short)*lvl->totedge, "Multires Edge Flags");
-		if(!mesh->mr->edge_creases)
-			mesh->mr->edge_creases= MEM_callocN(sizeof(char)*lvl->totedge, "Multires Edge Creases");
+		mesh->mr->edge_flags= newdataadr(fd, mesh->mr->edge_flags);
+		mesh->mr->edge_creases= newdataadr(fd, mesh->mr->edge_creases);
 
 		mesh->mr->verts = newdataadr(fd, mesh->mr->verts);