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/blenloader | |
| 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/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c11d9411821..b2a75b508a0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -100,7 +100,6 @@ #include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_cellalloc.h" #include "BLI_edgehash.h" #include "BKE_anim.h" @@ -3733,7 +3732,7 @@ static void direct_link_dverts(FileData *fd, int count, MDeformVert *mdverts) MDeformWeight *dw; if(mdverts->dw && (dw= newdataadr(fd, mdverts->dw))) { const ssize_t dw_len= mdverts->totweight * sizeof(MDeformWeight); - void *dw_tmp= BLI_cellalloc_malloc(dw_len, "direct_link_dverts"); + void *dw_tmp= MEM_mallocN(dw_len, "direct_link_dverts"); memcpy(dw_tmp, dw, dw_len); mdverts->dw= dw_tmp; MEM_freeN(dw); @@ -3757,7 +3756,7 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte if (mdisps[i].disps) { float *disp2; - disp2 = BLI_cellalloc_malloc(MEM_allocN_len(mdisps[i].disps), "cellalloc .disps copy"); + disp2 = MEM_mallocN(MEM_allocN_len(mdisps[i].disps), "cellalloc .disps copy"); memcpy(disp2, mdisps[i].disps, MEM_allocN_len(mdisps[i].disps)); MEM_freeN(mdisps[i].disps); |