bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix for fracture object crash

Browse Source 
Issue was caused by incorrect resetting of tesselated fave data in copy_mesh:
- CustomData_free will free data from original mesh because layers in new mesh
  are pointing to the same memory just after copy. So it's needed only to
  set some pointers to NULL.
- It was incorrect filling fdata with zeroes because of incorrect structure size used.
This commit is contained in:
Sergey Sharybin 2012-03-06 16:22:41 +00:00
parent 5ba020da4f
commit bffeab99ae
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenkernel/intern/mesh.c
View File

@ -452,6 +452,19 @@ void free_dverts(MDeformVert *dvert, int totvert)
MEM_freeN (dvert);
}
static void mesh_tessface_clear_intern(Mesh *mesh, int free_customdata)
{
if (free_customdata)
CustomData_free(&mesh->fdata, mesh->totface);
mesh->mface = NULL;
mesh->mtface = NULL;
mesh->mcol = NULL;
mesh->totface = 0;
memset(&mesh->fdata, 0, sizeof(mesh->fdata));
}
Mesh *add_mesh(const char *name)
{
Mesh *me;
@ -492,7 +505,7 @@ Mesh *copy_mesh(Mesh *me)
CustomData_copy(&me->fdata, &men->fdata, CD_MASK_MESH, CD_DUPLICATE, men->totface);
}
else {
BKE_mesh_tessface_clear(men);
mesh_tessface_clear_intern(men, FALSE);
}
mesh_update_customdata_pointers(men, do_tessface);
@ -2971,12 +2984,5 @@ void BKE_mesh_tessface_ensure(Mesh *mesh)
void BKE_mesh_tessface_clear(Mesh *mesh)
{
CustomData_free(&mesh->fdata, mesh->totface);
mesh->mface = NULL;
mesh->mtface = NULL;
mesh->mcol = NULL;
mesh->totface = 0;
memset(&mesh->fdata, 0, sizeof(&mesh->fdata));
mesh_tessface_clear_intern(mesh, TRUE);
}