Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / particle_child.c
index 48ecdb04348100855acfa3e8ffec52e189393c47..8cdd668b7e7e8602815206ce9ec62b266733edaf 100644 (file)
@@ -817,7 +817,7 @@ void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx,
 
        if (part->flag & PART_CHILD_EFFECT)
                /* state is safe to cast, since only co and vel are used */
-               guided = do_guides(sim->psys->part, sim->psys->effectors, (ParticleKey *)state, cpa->parent, t);
+               guided = do_guides(sim->eval_ctx, sim->psys->part, sim->psys->effectors, (ParticleKey *)state, cpa->parent, t);
 
        if (guided == 0) {
                float orco_offset[3];