griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Modifier stack: remove last usage of DM in WeightVGProximity .

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-09 10:10:30 +02:00
parent 4da2aec2bb
commit d152a326f9
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@@ -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);
}
/**