From 133dadcdee15bfde06c538ff013781a308833175 Mon Sep 17 00:00:00 2001 From: Germano Date: Thu, 3 May 2018 18:19:36 -0300 Subject: Fix `Transfer Mesh Data` with `Edge Mapping` of type `Projected Edge Interpolated` and `Ray Radius` other than 0.0. `MREMAP_RAYCAST_APPROXIMATE_BVHEPSILON(ray_radius)` greatly increased the radius making for example that 0.1 becoming 1.5 Now the result is much more predictable. --- source/blender/blenkernel/intern/mesh_remap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- cgit v1.2.3 From 16253285ff66039b2e861422e96a102e3118205a Mon Sep 17 00:00:00 2001 From: Germano Date: Thu, 3 May 2018 18:33:16 -0300 Subject: BKE: BVHtree: make `bvhtree_from_mesh_edges` a static function. This will help us have more control over bvhtrees that are cached. --- source/blender/blenkernel/BKE_bvhutils.h | 3 --- source/blender/blenkernel/intern/bvhutils.c | 2 +- 2 files changed, 1 insertion(+), 4 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) { -- cgit v1.2.3