[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13676] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: A second try at bug a fix for bug: [ #8274] Particle System cannot be persuaded to recalculate

[Janne Karhu]

Revision: 13676
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13676
Author:   jhk
Date:     2008-02-13 20:48:13 +0100 (Wed, 13 Feb 2008)

Log Message:
-----------
A second try at bug a fix for bug: [#8274] Particle System cannot be persuaded to recalculate
-This time with a correct ">" instead of the previous "<"

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	2008-02-13 18:57:28 UTC (rev 13675)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-13 19:48:13 UTC (rev 13676)
@@ -4118,7 +4118,10 @@
 
 			pa_die=0;
 
-			if(pa->alive==PARS_UNBORN || pa->alive==PARS_KILLED || ELEM(part->phystype,PART_PHYS_NO,PART_PHYS_KEYED)){
+			if(pa->alive==PARS_UNBORN
+				|| pa->alive==PARS_KILLED
+				|| ELEM(part->phystype,PART_PHYS_NO,PART_PHYS_KEYED)
+				|| pa->time >= ctime){
 				/* allways reset particles to emitter before birth */
 				reset_particle(pa,psys,psmd,ob,dtime,cfra,vg_vel,vg_tan,vg_rot);
 				copy_particle_key(key,&pa->state,1);