diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2009-12-26 02:51:29 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2009-12-26 02:51:29 +0300 |
| commit | fc066a6a5d01718981c9dcae23c5f4f47f3d7b1e (patch) | |
| tree | 239042728e0a5f846ce95a967824aa1bc6288cb8 /source/blender/blenkernel/intern/particle.c | |
| parent | 99e3423a500d59e3493c4e8db8665c97aa02e110 (diff) | |
Fix for [#20458] Segmentation fault when trying to enable Hair dynamics
* The hair mesh vertex index was stored as a short, but vertex counts can easily go higher than what fits in a short so changed this to an int.
* Also removed particle life looping, which didn't work correctly anyways. Similar functionality will become available when I get to recoding reactor particles into a better system.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index b19b0f9fa20..992f63520ab 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4069,7 +4069,7 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta else{ if(cpa){ ParticleKey *key1; - float t = (cfra - pa->time + pa->loop * pa->lifetime) / pa->lifetime; + float t = (cfra - pa->time) / pa->lifetime; key1=&pa->state; offset_child(cpa, key1, state, part->childflat, part->childrad); |