diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 21:51:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 21:51:30 +0400 |
| commit | cadfac5a0f54c2e7086a6c1cf93f90adcbd1b7bb (patch) | |
| tree | 5ac97cdf4b8b6e5a829448ad7de34c59e7c35053 /source/blender/blenkernel/intern/particle_system.c | |
| parent | cc0abf99632064f9daba60be8867f2addd28b9e8 (diff) | |
| parent | 99736f373c12e7ab91f962c738243bddf2d713c6 (diff) | |
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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 451e576979a..2cdb5ecd5d3 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; |