From 3f3c19e39142e861d8e2c492ebd902980503b620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Fri, 21 Nov 2014 16:00:24 +0100 Subject: Another fix for particle instance child lookups, was not subtracting parent amount. --- source/blender/modifiers/intern/MOD_particleinstance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c') diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index bf10863c9ab..f88dc789ba2 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -334,7 +334,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, if (first_particle + p < psys->totpart) pa = psys->particles + first_particle + p; else { - ChildParticle *cpa = psys->child + p; + ChildParticle *cpa = psys->child + (p - psys->totpart); pa = psys->particles + cpa->parent; } psys_mat_hair_to_global(sim.ob, sim.psmd->dm, sim.psys->part->from, pa, hairmat); -- cgit v1.2.3