diff options
author | Germano <germano.costa@ig.com.br> | 2018-05-04 00:47:14 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-05-04 00:47:14 +0300 |
commit | 892dd3d069508319a8eff8a1401977e27d01f648 (patch) | |
tree | bd99c68581176b366883c699e58a7bfa4461f174 /source/blender | |
parent | e245f7c09c6405f9e7197163d1fc37c7dc5d90f7 (diff) | |
parent | 16253285ff66039b2e861422e96a102e3118205a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_remap.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index ab3f9bc1a87..b9f07e07f12 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -126,9 +126,6 @@ BVHTree *bvhtree_from_editmesh_edges_ex( const BLI_bitmap *edges_mask, int edges_num_active, float epsilon, int tree_type, int axis); -BVHTree *bvhtree_from_mesh_edges( - struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, - float epsilon, int tree_type, int axis); BVHTree *bvhtree_from_mesh_edges_ex( struct BVHTreeFromMesh *data, const struct MVert *vert, const bool vert_allocated, diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 7f50fcfcb2b..416ac3cbaa0 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -709,7 +709,7 @@ BVHTree *bvhtree_from_editmesh_edges( } /* Builds a bvh tree where nodes are the edges of the given dm */ -BVHTree *bvhtree_from_mesh_edges( +static BVHTree *bvhtree_from_mesh_edges( BVHTreeFromMesh *data, DerivedMesh *dm, float epsilon, int tree_type, int axis) { diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index c503799d28f..8dc812463db 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -862,7 +862,7 @@ void BKE_mesh_remap_calc_edges_from_dm( /* Here it's simpler to just allocate for all edges :/ */ float *weights = MEM_mallocN(sizeof(*weights) * (size_t)numedges_src, __func__); - bvhtree_from_mesh_edges(&treedata, dm_src, MREMAP_RAYCAST_APPROXIMATE_BVHEPSILON(ray_radius), 2, 6); + bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_EDGES, 2); for (i = 0; i < numedges_dst; i++) { /* For each dst edge, we sample some rays from it (interpolated from its vertices) @@ -916,8 +916,10 @@ void BKE_mesh_remap_calc_edges_from_dm( interp_v3_v3v3_slerp_safe(tmp_no, v1_no, v2_no, fac); while (n--) { + float radius = (ray_radius / w); + treedata.sphere_radius = radius; if (mesh_remap_bvhtree_query_raycast( - &treedata, &rayhit, tmp_co, tmp_no, ray_radius / w, max_dist, &hit_dist)) + &treedata, &rayhit, tmp_co, tmp_no, radius, max_dist, &hit_dist)) { weights[rayhit.index] += w; totweights += w; |