griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a particle memory allocation mismatch using MEM_allocN for alloc and BLI_cellalloc_free for free

Browse Source
This commit is contained in:
Andrew Wiggin
2011-11-09 14:39:49 +00:00
parent 4075fd85b9
commit 0811236da2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/particle_system.c
View File

@@ -67,6 +67,7 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
#include "BLI_edgehash.h"
#include "BLI_cellalloc.h"
#include "BKE_main.h"
#include "BKE_animsys.h"
@@ -3483,7 +3484,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
if(dvert) {
if(!dvert->totweight) {
dvert->dw = MEM_callocN (sizeof(MDeformWeight), "deformWeight");
dvert->dw = BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight");
dvert->totweight = 1;
}
@@ -3504,7 +3505,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
if(dvert) {
if(!dvert->totweight) {
dvert->dw = MEM_callocN (sizeof(MDeformWeight), "deformWeight");
dvert->dw = BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight");
dvert->totweight = 1;
}
/* roots should be 1.0, the rest can be anything from 0.0 to 1.0 */