diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-07-05 06:56:14 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-07-05 06:56:14 +0400 |
| commit | db2d737f0e646a49671f7645f22f24cf1cb28a7a (patch) | |
| tree | 269718d57feeecbdb7980d7435cd289f2bfc2c37 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 35965308a85a1a2280c4e27eff7405a7ba7f0369 (diff) | |
Fix for [#27182] particle/collision kill interacting strangely
* Particle die time wasn't taken correctly into account in certain situations when calculating dynamics.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 4e3840832bb..b2e5c059edf 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3670,7 +3670,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) pa->size *= 1.0f - part->randsize * PSYS_FRAND(p + 1); birthtime = pa->time; - dietime = birthtime + pa->lifetime; + dietime = pa->dietime; /* store this, so we can do multiple loops over particles */ pa->state.time = dfra; |