diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-12-12 00:39:54 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-12-12 00:39:54 +0400 |
| commit | b5ce1b1a23a3befbcc4cd3c67a5ec6a76d77aa5a (patch) | |
| tree | f062eceab474134899e67d5d84bd5420bb552dc8 /source/blender/blenkernel/intern/collision.c | |
| parent | 892d21631b46f9c34fe1648dec9c78bb18a58876 (diff) | |
Fix for cloth/smoke: Collision and flow objects always had to be on the same layer.
Reported and patch by MiikaH
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |