diff options
Diffstat (limited to 'source/blender/blenkernel/intern/deform.c')
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 0c3c78f6eef..9539e6a4bfa 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -45,6 +45,9 @@ #include "BLI_utildefines.h" +#include "BLI_cellalloc.h" + + void defgroup_copy_list (ListBase *outbase, ListBase *inbase) { bDeformGroup *defgroup, *defgroupn; @@ -83,10 +86,10 @@ void defvert_copy (MDeformVert *dvert_r, const MDeformVert *dvert) } else { if(dvert_r->dw) - MEM_freeN(dvert_r->dw); + BLI_cellalloc_free(dvert_r->dw); if(dvert->totweight) - dvert_r->dw= MEM_dupallocN(dvert->dw); + dvert_r->dw= BLI_cellalloc_dupalloc(dvert->dw); else dvert_r->dw= NULL; @@ -530,10 +533,10 @@ MDeformWeight *defvert_verify_index(MDeformVert *dv, const int defgroup) if(newdw) return newdw; - newdw= MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight"); - if (dv->dw) { + newdw= BLI_cellalloc_calloc(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight"); + if(dv->dw) { memcpy(newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight); - MEM_freeN(dv->dw); + BLI_cellalloc_free(dv->dw); } dv->dw= newdw; newdw += dv->totweight; |