[Bf-blender-cvs] [d152a326f9a] blender2.8: Modifier stack: remove last usage of DM in WeightVGProximity .

[Bastien Montagne]

Commit: d152a326f9a3fb5c6cf025b7d486e1dc2b482d74
Author: Bastien Montagne
Date:   Wed May 9 10:10:30 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd152a326f9a3fb5c6cf025b7d486e1dc2b482d74

Modifier stack: remove last usage of DM in WeightVGProximity .

===================================================================

M	source/blender/modifiers/intern/MOD_weightvgproximity.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index ace381917bc..8294f457285 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -150,12 +150,9 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 	BVHTreeFromMesh treeData_e = {NULL};
 	BVHTreeFromMesh treeData_f = {NULL};
 
-	/* XXX TODO horrible, but simpler for now, bvhtree needs some love first! */
-	DerivedMesh *target_dm = CDDM_from_mesh(target);
-
 	if (dist_v) {
 		/* Create a bvh-tree of the given target's verts. */
-		bvhtree_from_mesh_get(&treeData_v, target_dm, BVHTREE_FROM_VERTS, 2);
+		BKE_bvhtree_from_mesh_get(&treeData_v, target, BVHTREE_FROM_VERTS, 2);
 		if (treeData_v.tree == NULL) {
 			OUT_OF_MEMORY();
 			return;
@@ -163,7 +160,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 	}
 	if (dist_e) {
 		/* Create a bvh-tree of the given target's edges. */
-		bvhtree_from_mesh_get(&treeData_e, target_dm, BVHTREE_FROM_EDGES, 2);
+		BKE_bvhtree_from_mesh_get(&treeData_e, target, BVHTREE_FROM_EDGES, 2);
 		if (treeData_e.tree == NULL) {
 			OUT_OF_MEMORY();
 			return;
@@ -171,7 +168,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 	}
 	if (dist_f) {
 		/* Create a bvh-tree of the given target's faces. */
-		bvhtree_from_mesh_get(&treeData_f, target_dm, BVHTREE_FROM_LOOPTRI, 2);
+		BKE_bvhtree_from_mesh_get(&treeData_f, target, BVHTREE_FROM_LOOPTRI, 2);
 		if (treeData_f.tree == NULL) {
 			OUT_OF_MEMORY();
 			return;
@@ -204,8 +201,6 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 		free_bvhtree_from_mesh(&treeData_e);
 	if (dist_f)
 		free_bvhtree_from_mesh(&treeData_f);
-
-	target_dm->release(target_dm);
 }
 
 /**