Merge branch 'master' into blender2.8

2018-09-03 15:33:07 +02:00
parent 3dee8b4a12 c6bbe6c5aa
commit 30a2ad8efe
2 changed files with 7 additions and 1 deletions
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1365,6 +1365,7 @@ void cloth_find_point_contacts(Depsgraph *depsgraph, Object *ob, ClothModifierDa
 	if (!collobjs) {
 		*r_collider_contacts = NULL;
 		*r_totcolliders = 0;
+		BLI_bvhtree_free(cloth_bvh);
 		return;
 	}