From b5ce1b1a23a3befbcc4cd3c67a5ec6a76d77aa5a Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Tue, 11 Dec 2012 20:39:54 +0000 Subject: [PATCH] Fix for cloth/smoke: Collision and flow objects always had to be on the same layer. Reported and patch by MiikaH --- source/blender/blenkernel/intern/collision.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 4641a02265a..f0043d9fa77 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -567,7 +567,9 @@ Object **get_collisionobjects(Scene *scene, Object *self, Group *group, unsigned Scene *sce_iter; /* add objects in same layer in scene */ for (SETLOOPER(scene, sce_iter, base)) { - if (base->lay & self->lay) + /* Need to check for active layers, too. + Otherwise this check fails if the objects are not on the same layer - DG */ + if ((base->lay & self->lay) || (base->lay & scene->lay)) add_collision_object(&objs, &numobj, &maxobj, base->object, self, 0, modifier_type); }