[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25557] trunk/blender/source/blender/ blenkernel/intern/particle.c: Particles bug fix: using virtual parents for child particles crashed in some cases.

[Janne Karhu]

Revision: 25557
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25557
Author:   jhk
Date:     2009-12-25 23:58:11 +0100 (Fri, 25 Dec 2009)

Log Message:
-----------
Particles bug fix: using virtual parents for child particles crashed in some cases.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2009-12-25 22:16:19 UTC (rev 25556)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2009-12-25 22:58:11 UTC (rev 25557)
@@ -2444,7 +2444,7 @@
 			mul_m4_v3(ob->obmat,cpa_1st);
 		}
 
-		pa = psys->particles + cpa->parent;
+		pa = psys->particles + cpa->pa[0];
 
 		psys_mat_hair_to_global(ob, ctx->sim.psmd->dm, psys->part->from, pa, hairmat);