diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-21 18:00:24 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:08 +0300 |
| commit | 3f3c19e39142e861d8e2c492ebd902980503b620 (patch) | |
| tree | 89145734f363c1f9aa692b19db9c7a3e63bc8997 /source/blender/modifiers/intern/MOD_particleinstance.c | |
| parent | c3c19509b3ecea26b49115cdc9a47f786ac76954 (diff) | |
Another fix for particle instance child lookups, was not subtracting
parent amount.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |