diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 17:04:56 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 18:15:07 +0300 |
commit | 2c9b32949bc00e73603bcabadb74e5b3176a161a (patch) | |
tree | f6bb1ee5b514cce92db337c3116ac967821a4c65 /source/blender/blenkernel/intern/collision.c | |
parent | 26251282e093d4c0d04c4c667b0b32ad66d329b2 (diff) |
Cleanup: refactor depsgraph physics API functions.
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 546f37dbee6..1debdbb847e 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -545,14 +545,7 @@ void BKE_collision_relations_free(ListBase *relations) * Self will be excluded. */ Object **BKE_collision_objects_create(Depsgraph *depsgraph, Object *self, Collection *collection, unsigned int *numcollobj, unsigned int modifier_type) { - ListBase *relations; - - if (modifier_type == eModifierType_Smoke) { - relations = DEG_get_smoke_collision_relations(depsgraph, collection); - } - else { - relations = DEG_get_collision_relations(depsgraph, collection); - } + ListBase *relations = DEG_get_collision_relations(depsgraph, collection, modifier_type); if (!relations) { return NULL; @@ -592,8 +585,7 @@ void BKE_collision_objects_free(Object **objects) * Self will be excluded. */ ListBase *BKE_collider_cache_create(Depsgraph *depsgraph, Object *self, Collection *collection) { - /* TODO: does this get built? */ - ListBase *relations = DEG_get_collision_relations(depsgraph, collection); + ListBase *relations = DEG_get_collision_relations(depsgraph, collection, eModifierType_Collision); ListBase *cache = NULL; if (!relations) { |