From a99dcab148ed209409f3b2479ada12d869ae84b6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 22 Jun 2018 14:42:03 +0200 Subject: Depsgraph: cache collision relations, for performance and stability. Same reasoning as effector relations in earlier commit. --- source/blender/blenkernel/intern/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/effect.c') diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index adf5b5da35e..2894ff4f1e7 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -267,11 +267,11 @@ void BKE_effector_relations_free(ListBase *lb) /* Create effective list of effectors from relations built beforehand. */ ListBase *BKE_effectors_create( Depsgraph *depsgraph, - Scene *scene, Object *ob_src, ParticleSystem *psys_src, EffectorWeights *weights) { + Scene *scene = DEG_get_evaluated_scene(depsgraph); ListBase *relations = DEG_get_effector_relations(depsgraph, weights->group); ListBase *effectors = NULL; @@ -420,7 +420,7 @@ static float eff_calc_visibility(ListBase *colliders, EffectorCache *eff, Effect return visibility; if (!colls) - colls = get_collider_cache(eff->scene, eff->ob, NULL); + colls = BKE_collider_cache_create(eff->depsgraph, eff->ob, NULL); if (!colls) return visibility; @@ -458,7 +458,7 @@ static float eff_calc_visibility(ListBase *colliders, EffectorCache *eff, Effect } if (!colliders) - free_collider_cache(&colls); + BKE_collider_cache_free(&colls); return visibility; } -- cgit v1.2.3