[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13674] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for bug: [#8274] Particle System cannot be persuaded to recalculate

[Janne Karhu]

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

Log Message:
-----------
Fix for bug: [#8274] Particle System cannot be persuaded to recalculate
-The exact time for a particle being unborn or alive needed some adjusting

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 14:40:43 UTC (rev 13673)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-13 15:33:37 UTC (rev 13674)
@@ -4118,7 +4118,8 @@
 
 			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 <= cfra){
 				/* 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);