[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35542] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#20171] Properties of Hair are not animateable

Janne Karhu jhkarh at gmail.com
Mon Mar 14 18:37:51 CET 2011


Revision: 35542
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35542
Author:   jhk
Date:     2011-03-14 17:37:51 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Fix for [#20171] Properties of Hair are not animateable
* Don't know when this got broken again, but now the "regrow hair" option works like it's supposed to again.

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-03-14 16:11:56 UTC (rev 35541)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-03-14 17:37:51 UTC (rev 35542)
@@ -4035,7 +4035,8 @@
 
 				for(i=0; i<=part->hair_step; i++){
 					hcfra=100.0f*(float)i/(float)psys->part->hair_step;
-					BKE_animsys_evaluate_animdata(&part->id, part->adt, hcfra, ADT_RECALC_ANIM);
+					if((part->flag & PART_HAIR_REGROW)==0)
+						BKE_animsys_evaluate_animdata(&part->id, part->adt, hcfra, ADT_RECALC_ANIM);
 					system_step(&sim, hcfra);
 					psys->cfra = hcfra;
 					psys->recalc = 0;




More information about the Bf-blender-cvs mailing list