From fe19e5336bfa819be3ed018cb7e05ca835ed72be Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Fri, 10 Dec 2010 08:29:46 +0000 Subject: Fix for [#25095] Particle systems and object with collision modifier bug * Collisions didn't take emitter object layer into account --- source/blender/blenkernel/intern/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/effect.c') diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 24a95c58e36..51f2203b525 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -432,7 +432,7 @@ static float eff_calc_visibility(ListBase *colliders, EffectorCache *eff, Effect return visibility; if(!colls) - colls = get_collider_cache(eff->scene, NULL, NULL); + colls = get_collider_cache(eff->scene, eff->ob, NULL); if(!colls) return visibility; -- cgit v1.2.3