diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 8fedcd4ab06..2392c92bd84 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -44,7 +44,7 @@ #include "BLI_kdopbvh.h" struct CollisionModifierData; -struct Group; +struct Collection; struct MFace; struct MVert; struct Object; @@ -148,9 +148,9 @@ void collision_get_collider_velocity(float vel_old[3], float vel_new[3], struct ///////////////////////////////////////////////// /* explicit control over layer mask and dupli recursion */ -struct Object **get_collisionobjects_ext(struct Scene *scene, struct Object *self, struct Group *group, int layer, unsigned int *numcollobj, unsigned int modifier_type, bool dupli); +struct Object **get_collisionobjects_ext(struct Scene *scene, struct Object *self, struct Collection *collection, unsigned int *numcollobj, unsigned int modifier_type, bool dupli); -struct Object **get_collisionobjects(struct Scene *scene, struct Object *self, struct Group *group, unsigned int *numcollobj, unsigned int modifier_type); +struct Object **get_collisionobjects(struct Scene *scene, struct Object *self, struct Collection *collection, unsigned int *numcollobj, unsigned int modifier_type); typedef struct ColliderCache { struct ColliderCache *next, *prev; @@ -158,7 +158,7 @@ typedef struct ColliderCache { struct CollisionModifierData *collmd; } ColliderCache; -struct ListBase *get_collider_cache(struct Scene *scene, struct Object *self, struct Group *group); +struct ListBase *get_collider_cache(struct Scene *scene, struct Object *self, struct Collection *collection); void free_collider_cache(struct ListBase **colliders); ///////////////////////////////////////////////// |