Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano <germano.costa@ig.com.br>2018-05-04 13:43:08 +0300
committerGermano <germano.costa@ig.com.br>2018-05-04 13:43:08 +0300
commitb886cdf81d94edb62cac73578fa8ab9ede623452 (patch)
treeb32541dee8e6ba5b1e6879516855ac745c89cb57
parent3d26cf112b2d1b71f908123cf72caa495e8e3f74 (diff)
Mesh Remap: Change the sphere_radius parameter instead of creating a bvhtree with epsilon equal to the value of ray_radius.
This is the desirable behavior. It also removes one more use of `bvhtree_from_mesh_looptri`.
-rw-r--r--source/blender/blenkernel/intern/mesh_remap.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index 8dc812463db..84994e80784 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -543,15 +543,13 @@ void BKE_mesh_remap_calc_verts_from_dm(
float *weights = MEM_mallocN(sizeof(*weights) * tmp_buff_size, __func__);
dm_src->getVertCos(dm_src, vcos_src);
- if (mode & MREMAP_USE_NORPROJ) {
- bvhtree_from_mesh_looptri(
- &treedata, dm_src, ray_radius, 2, 6);
- }
- else {
- bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_LOOPTRI, 2);
- }
+
+ bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_LOOPTRI, 2);
if (mode == MREMAP_MODE_VERT_POLYINTERP_VNORPROJ) {
+ if (mode & MREMAP_USE_NORPROJ) {
+ treedata.sphere_radius = ray_radius;
+ }
for (i = 0; i < numverts_dst; i++) {
copy_v3_v3(tmp_co, verts_dst[i].co);
normal_short_to_float_v3(tmp_no, verts_dst[i].no);