diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-26 00:18:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-26 00:18:12 +0400 |
| commit | c7e8af13d4aefe8237e925bf817c56e802aaf7b0 (patch) | |
| tree | 2f34713219c9641ac5aa9f78af756a49c18dc0bd /source/blender/editors/object/object_vgroup.c | |
| parent | 4fae6cd38d55997e77fdbe31e204511a2a9de154 (diff) | |
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement.
See Details:
http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
Diffstat (limited to 'source/blender/editors/object/object_vgroup.c')
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9289f9794b9..66a4d37b2bb 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -50,7 +50,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_cellalloc.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -362,12 +361,12 @@ int ED_vgroup_copy_array(Object *ob, Object *ob_from) for(i=0; i<dvert_tot; i++, dvf++, dv++) { if((*dv)->dw) - BLI_cellalloc_free((*dv)->dw); + MEM_freeN((*dv)->dw); *(*dv)= *(*dvf); if((*dv)->dw) - (*dv)->dw= BLI_cellalloc_dupalloc((*dv)->dw); + (*dv)->dw= MEM_dupallocN((*dv)->dw); } MEM_freeN(dvert_array); @@ -1900,7 +1899,7 @@ static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg) else if(ob->type==OB_LATTICE) { Lattice *lt= vgroup_edit_lattice(ob); if(lt->dvert) { - BLI_cellalloc_free(lt->dvert); + MEM_freeN(lt->dvert); lt->dvert= NULL; } } @@ -1952,7 +1951,7 @@ static void vgroup_delete_all(Object *ob) else if(ob->type==OB_LATTICE) { Lattice *lt= vgroup_edit_lattice(ob); if(lt->dvert) { - BLI_cellalloc_free(lt->dvert); + MEM_freeN(lt->dvert); lt->dvert= NULL; } } |