[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13751] trunk/blender/source/blender/ blenkernel/intern/particle_system.c:

[Brecht Van Lommel]

Revision: 13751
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13751
Author:   blendix
Date:     2008-02-18 16:56:34 +0100 (Mon, 18 Feb 2008)

Log Message:
-----------

Disable particle time looping for hair, doesn't have any purpose there,
only gives weird results.

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-18 15:53:12 UTC (rev 13750)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-18 15:56:34 UTC (rev 13751)
@@ -4050,7 +4050,7 @@
 
 			reset_particle(pa,psys,psmd,ob,dtime,cfra,vg_vel,vg_tan,vg_rot);
 
-			if(cfra>pa->time && part->flag & PART_LOOP){
+			if(cfra>pa->time && part->flag & PART_LOOP && part->type!=PART_HAIR){
 				pa->loop=(short)((cfra-pa->time)/pa->lifetime);
 				pa->alive=PARS_UNBORN;
 			}
@@ -4185,7 +4185,7 @@
 					if(pa_die){
 						push_reaction(ob,psys,p,PART_EVENT_DEATH,key);
 
-						if(part->flag & PART_LOOP){
+						if(part->flag & PART_LOOP && part->type!=PART_HAIR){
 							pa->loop++;
 							reset_particle(pa,psys,psmd,ob,0.0,cfra,vg_vel,vg_tan,vg_rot);
 							copy_particle_key(key,&pa->state,1);
@@ -4323,7 +4323,7 @@
 
 		psys->lattice=psys_get_lattice(ob,psys);
 
-		if(part->flag & PART_LOOP)
+		if(part->flag & PART_LOOP && part->type!=PART_HAIR)
 			pa->loop = (short)((cfra - pa->time) / pa->lifetime);
 		else
 			pa->loop = 0;