diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-01-05 11:52:13 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-01-05 11:52:13 +0300 |
| commit | 7a7760e938fc16acaa60d7a2e9c06167213536b3 (patch) | |
| tree | 784a1d7200749ca8b144e3687423be8398dd8359 /source | |
| parent | c8f0404f53259f6ded382a3b46a3cf23056b2af5 (diff) | |
Fix for [#25492] Cached particles are killed too early
* Own mistake from the sph particle fluids fix.
Diffstat (limited to 'source')
| -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 f0af7e8684b..f57364dfdef 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2943,7 +2943,7 @@ static void deflect_particle(ParticleSimulationData *sim, int p, float dfra, flo /* particle dies in collision */ if(through == 0 && (part->flag & PART_DIE_ON_COL || pd->flag & PDEFLE_KILL_PART)) { pa->alive = PARS_DYING; - pa->dietime = pa->state.time + (cfra - pa->state.time) * f; + pa->dietime = sim->psys->cfra + (cfra - sim->psys->cfra) * f; copy_v3_v3(pa->state.co, co); interp_v3_v3v3(pa->state.vel, pa->prev_state.vel, pa->state.vel, f); |