1 files changed, 42 insertions, 32 deletions

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index b38d6b8bceb..b41c4633ccb 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -46,7 +46,9 @@
 #include "BLI_edgehash.h"
 
 #include "BKE_cloth.h"
+#include "BKE_collection.h"
 #include "BKE_effect.h"
+#include "BKE_layer.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
 
@@ -501,40 +503,44 @@ static void add_collision_object(Object ***objs, unsigned int *numobj, unsigned
 
 	/* objects in dupli groups, one level only for now */
 	if (ob->dup_group && level == 0) {
-		GroupObject *go;
-		Group *group= ob->dup_group;
+		Collection *collection= ob->dup_group;
 
 		/* add objects */
-		for (go= group->gobject.first; go; go= go->next)
-			add_collision_object(objs, numobj, maxobj, go->ob, self, level+1, modifier_type);
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object)
+		{
+			add_collision_object(objs, numobj, maxobj, object, self, level+1, modifier_type);
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 	}
 }
 
 // return all collision objects in scene
 // collision object will exclude self
-Object **get_collisionobjects_ext(Scene *scene, Object *self, Group *group, int layer, unsigned int *numcollobj, unsigned int modifier_type, bool dupli)
+Object **get_collisionobjects_ext(Scene *scene, Object *self, Collection *collection, unsigned int *numcollobj, unsigned int modifier_type, bool dupli)
 {
-	Base *base;
 	Object **objs;
-	GroupObject *go;
 	unsigned int numobj= 0, maxobj= 100;
 	int level = dupli ? 0 : 1;
 
 	objs= MEM_callocN(sizeof(Object *)*maxobj, "CollisionObjectsArray");
 
 	/* gather all collision objects */
-	if (group) {
-		/* use specified group */
-		for (go= group->gobject.first; go; go= go->next)
-			add_collision_object(&objs, &numobj, &maxobj, go->ob, self, level, modifier_type);
+	if (collection) {
+		/* use specified collection */
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object)
+		{
+			add_collision_object(&objs, &numobj, &maxobj, object, self, level, modifier_type);
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 	}
 	else {
 		Scene *sce_iter;
+		Base *base;
 		/* add objects in same layer in scene */
 		for (SETLOOPER(scene, sce_iter, base)) {
-			if ( base->lay & layer )
+			if ((base->flag & BASE_VISIBLED) != 0) {
 				add_collision_object(&objs, &numobj, &maxobj, base->object, self, level, modifier_type);
-
+			}
 		}
 	}
 
@@ -543,11 +549,11 @@ Object **get_collisionobjects_ext(Scene *scene, Object *self, Group *group, int
 	return objs;
 }
 
-Object **get_collisionobjects(Scene *scene, Object *self, Group *group, unsigned int *numcollobj, unsigned int modifier_type)
+Object **get_collisionobjects(Scene *scene, Object *self, Collection *collection, unsigned int *numcollobj, unsigned int modifier_type)
 {
 	/* Need to check for active layers, too.
 	   Otherwise this check fails if the objects are not on the same layer - DG */
-	return get_collisionobjects_ext(scene, self, group, self->lay | scene->lay, numcollobj, modifier_type, true);
+	return get_collisionobjects_ext(scene, self, collection, numcollobj, modifier_type, true);
 }
 
 static void add_collider_cache_object(ListBase **objs, Object *ob, Object *self, int level)
@@ -573,26 +579,30 @@ static void add_collider_cache_object(ListBase **objs, Object *ob, Object *self,
 		BLI_addtail(*objs, col);
 	}
 
-	/* objects in dupli groups, one level only for now */
+	/* objects in dupli collection, one level only for now */
 	if (ob->dup_group && level == 0) {
-		GroupObject *go;
-		Group *group= ob->dup_group;
+		Collection *collection= ob->dup_group;
 
 		/* add objects */
-		for (go= group->gobject.first; go; go= go->next)
-			add_collider_cache_object(objs, go->ob, self, level+1);
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object)
+		{
+			add_collider_cache_object(objs, object, self, level+1);
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 	}
 }
 
-ListBase *get_collider_cache(Scene *scene, Object *self, Group *group)
+ListBase *get_collider_cache(Scene *scene, Object *self, Collection *collection)
 {
-	GroupObject *go;
 	ListBase *objs= NULL;
 
 	/* add object in same layer in scene */
-	if (group) {
-		for (go= group->gobject.first; go; go= go->next)
-			add_collider_cache_object(&objs, go->ob, self, 0);
+	if (collection) {
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object)
+		{
+			add_collider_cache_object(&objs, object, self, 0);
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 	}
 	else {
 		Scene *sce_iter;
@@ -600,7 +610,7 @@ ListBase *get_collider_cache(Scene *scene, Object *self, Group *group)
 
 		/* add objects in same layer in scene */
 		for (SETLOOPER(scene, sce_iter, base)) {
-			if (!self || (base->lay & self->lay))
+			if (!self || ((base->flag & BASE_VISIBLED) != 0))
 				add_collider_cache_object(&objs, base->object, self, 0);
 
 		}
@@ -676,7 +686,7 @@ static int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, Collision
 }
 
 // cloth - object collisions
-int cloth_bvh_objcollision(Object *ob, ClothModifierData *clmd, float step, float dt )
+int cloth_bvh_objcollision(Scene *scene, Object *ob, ClothModifierData *clmd, float step, float dt )
 {
 	Cloth *cloth= clmd->clothObject;
 	BVHTree *cloth_bvh= cloth->bvhtree;
@@ -702,7 +712,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData *clmd, float step, floa
 	bvhtree_update_from_cloth ( clmd, 1 ); // 0 means STATIC, 1 means MOVING (see later in this function)
 	bvhselftree_update_from_cloth ( clmd, 0 ); // 0 means STATIC, 1 means MOVING (see later in this function)
 
-	collobjs = get_collisionobjects(clmd->scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
+	collobjs = get_collisionobjects(scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
 
 	if (!collobjs)
 		return 0;
@@ -1197,7 +1207,7 @@ static int cloth_points_objcollisions_resolve(
 }
 
 // cloth - object collisions
-int cloth_points_objcollision(Object *ob, ClothModifierData *clmd, float step, float dt)
+int cloth_points_objcollision(Scene *scene, Object *ob, ClothModifierData *clmd, float step, float dt)
 {
 	Cloth *cloth= clmd->clothObject;
 	BVHTree *cloth_bvh;
@@ -1230,7 +1240,7 @@ int cloth_points_objcollision(Object *ob, ClothModifierData *clmd, float step, f
 	/* balance tree */
 	BLI_bvhtree_balance(cloth_bvh);
 
-	collobjs = get_collisionobjects(clmd->scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
+	collobjs = get_collisionobjects(scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
 	if (!collobjs)
 		return 0;
 
@@ -1319,7 +1329,7 @@ int cloth_points_objcollision(Object *ob, ClothModifierData *clmd, float step, f
 	return 1|MIN2 ( ret, 1 );
 }
 
-void cloth_find_point_contacts(Object *ob, ClothModifierData *clmd, float step, float dt,
+void cloth_find_point_contacts(Scene *scene, Object *ob, ClothModifierData *clmd, float step, float dt,
                                ColliderContacts **r_collider_contacts, int *r_totcolliders)
 {
 	Cloth *cloth= clmd->clothObject;
@@ -1353,7 +1363,7 @@ void cloth_find_point_contacts(Object *ob, ClothModifierData *clmd, float step,
 	/* balance tree */
 	BLI_bvhtree_balance(cloth_bvh);
 
-	collobjs = get_collisionobjects(clmd->scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
+	collobjs = get_collisionobjects(scene, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
 	if (!collobjs) {
 		*r_collider_contacts = NULL;
 		*r_totcolliders = 0;