diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-20 20:08:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-20 20:08:17 +0300 |
| commit | c805d35c40f4dd1d15d9803636481b167d9ef6f0 (patch) | |
| tree | aff2480a97856273b2bcdc2f7b87d265683d5afa /source | |
| parent | 26b0261a53456d30d9aabcd9368afaeb95cf982b (diff) | |
Bugfix for strand simplification commit, made child particles
from particles crash.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index a8ccd12874e..0294596e84b 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -899,7 +899,8 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm /* no need to figure out distribution */ int child_nbr= (psys->renderdata)? part->ren_child_nbr: part->child_nbr; - alloc_child_particles(psys, 1.0f); + totpart= get_alloc_child_particles_tot(psys); + alloc_child_particles(psys, totpart); cpa=psys->child; for(i=0; i<child_nbr; i++){ for(p=0; p<psys->totpart; p++,cpa++){ |