[Bf-blender-cvs] [b886cdf81d9] master: Mesh Remap: Change the sphere_radius parameter instead of creating a bvhtree with epsilon equal to the value of ray_radius.

[Germano]

Commit: b886cdf81d94edb62cac73578fa8ab9ede623452
Author: Germano
Date:   Fri May 4 07:43:08 2018 -0300
Branches: master
https://developer.blender.org/rBb886cdf81d94edb62cac73578fa8ab9ede623452

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`.

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

M       source/blender/blenkernel/intern/mesh_remap.c

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

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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs