svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / blenkernel / intern / particle_system.c
index 451e576979ae6920392a7712a0d52698febe40e0..2cdb5ecd5d36cfc8fe67b11897a46be4306872b3 100644 (file)
@@ -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;