[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13675] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: It seems my fix for bug 8274 broke hair, so reverting that and opening the bug again in the tracker :)

[Janne Karhu]

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

Log Message:
-----------
It seems my fix for bug 8274 broke hair, so reverting that and opening the bug again in the tracker :)

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 15:33:37 UTC (rev 13674)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-13 18:57:28 UTC (rev 13675)
@@ -4118,8 +4118,7 @@
 
 			pa_die=0;
 
-			if(pa->alive==PARS_UNBORN || pa->alive==PARS_KILLED
-				|| ELEM(part->phystype,PART_PHYS_NO,PART_PHYS_KEYED) || pa->time <= cfra){
+			if(pa->alive==PARS_UNBORN || pa->alive==PARS_KILLED || ELEM(part->phystype,PART_PHYS_NO,PART_PHYS_KEYED)){
 				/* 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);