[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34089] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#25492] Cached particles are killed too early

[Janne Karhu]

Revision: 34089
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34089
Author:   jhk
Date:     2011-01-05 09:52:13 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Fix for [#25492] Cached particles are killed too early
* Own mistake from the sph particle fluids fix.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-01-05 08:31:05 UTC (rev 34088)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-01-05 08:52:13 UTC (rev 34089)
@@ -2943,7 +2943,7 @@
 			/* 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);