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/blenkernel/intern/particle_system.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/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 69ddcd21cb9..7587bfc4be8 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -71,7 +71,6 @@ #include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_edgehash.h" -#include "BLI_cellalloc.h" #include "BKE_main.h" #include "BKE_animsys.h" @@ -3537,7 +3536,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim) if(dvert) { if(!dvert->totweight) { - dvert->dw = BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight"); + dvert->dw = MEM_callocN(sizeof(MDeformWeight), "deformWeight"); dvert->totweight = 1; } @@ -3558,7 +3557,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim) if(dvert) { if(!dvert->totweight) { - dvert->dw = BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight"); + dvert->dw = MEM_callocN(sizeof(MDeformWeight), "deformWeight"); dvert->totweight = 1; } /* roots should be 1.0, the rest can be anything from 0.0 to 1.0 */ |