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

[Brecht Van Lommel]

Revision: 12961
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12961
Author:   blendix
Date:     2007-12-20 18:08:17 +0100 (Thu, 20 Dec 2007)

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

Bugfix for strand simplification commit, made child particles
from particles crash.

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	2007-12-20 17:04:10 UTC (rev 12960)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2007-12-20 17:08:17 UTC (rev 12961)
@@ -899,7 +899,8 @@
 			/* no need to figure out distribution */
 			int child_nbr= (psys->renderdata)? part->ren_child_nbr: part->child_nbr;
 
-			alloc_child_particles(psys, 1.0f);
+			totpart= get_alloc_child_particles_tot(psys);
+			alloc_child_particles(psys, totpart);
 			cpa=psys->child;
 			for(i=0; i<child_nbr; i++){
 				for(p=0; p<psys->totpart; p++,cpa++){