tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

2.5/Multires: 

Bugfix for loading older files with the pre-modifier multires.
This commit is contained in:
Nicholas Bishop 2009-06-21 02:51:42 +00:00
parent 09e64c6e2c
commit 984ab79629
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/multires.c
View File

@ -1270,8 +1270,10 @@ void multires_free(Multires *mr)
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) {

6
source/blender/blenloader/intern/readfile.c
View File

@ -3142,10 +3142,8 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
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);