Merge branch 'master' into blender2.8

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c
index e68f11f6274..c1121d5b1ea 100644
--- a/source/blender/blenkernel/intern/editmesh_bvh.c
+++ b/source/blender/blenkernel/intern/editmesh_bvh.c
@@ -147,9 +147,9 @@ BMBVHTree *BKE_bmbvh_new_ex(
 
 		BLI_bvhtree_insert(bmtree->tree, i, (float *)cos, 3);
 	}
-	
+
 	BLI_bvhtree_balance(bmtree->tree);
-	
+
 	return bmtree;
 }
 
@@ -188,11 +188,11 @@ BMBVHTree *BKE_bmbvh_new(
 void BKE_bmbvh_free(BMBVHTree *bmtree)
 {
 	BLI_bvhtree_free(bmtree->tree);
-	
+
 	if (bmtree->cos_cage && bmtree->cos_cage_free) {
 		MEM_freeN((void *)bmtree->cos_cage);
 	}
-	
+
 	MEM_freeN(bmtree);
 }
 
@@ -313,7 +313,7 @@ BMFace *BKE_bmbvh_ray_cast(BMBVHTree *bmtree, const float co[3], const float dir
 	/* ok to leave 'uv' uninitialized */
 	bmcb_data.looptris = (const BMLoop *(*)[3])bmtree->looptris;
 	bmcb_data.cos_cage = (const float (*)[3])bmtree->cos_cage;
-	
+
 	BLI_bvhtree_ray_cast(bmtree->tree, co, dir, radius, &hit, bmbvh_ray_cast_cb, &bmcb_data);
 
 	if (hit.index != -1 && hit.dist != dist) {