[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38106] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#27182] particle/ collision kill interacting strangely

[Janne Karhu]

Revision: 38106
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38106
Author:   jhk
Date:     2011-07-05 02:56:14 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Fix for [#27182] particle/collision kill interacting strangely
* Particle die time wasn't taken correctly into account in certain situations when calculating dynamics.

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-07-05 02:18:55 UTC (rev 38105)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-07-05 02:56:14 UTC (rev 38106)
@@ -3670,7 +3670,7 @@
 			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;