[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52898] trunk/blender/source/blender/ blenkernel/intern/collision.c: Fix for cloth/smoke: Collision and flow objects always had to be on the same layer.

[Daniel Genrich]

Revision: 52898
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52898
Author:   genscher
Date:     2012-12-11 20:39:54 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix for cloth/smoke: Collision and flow objects always had to be on the same layer. 

Reported and patch by MiikaH

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2012-12-11 19:45:16 UTC (rev 52897)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2012-12-11 20:39:54 UTC (rev 52898)
@@ -567,7 +567,9 @@
 		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);
 
 		}