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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Germano
2018-05-03 18:47:14 -03:00
parent e245f7c09c 16253285ff
commit 892dd3d069
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_bvhutils.h
View File

@@ -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,

2
source/blender/blenkernel/intern/bvhutils.c
View File

@@ -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)
{

6
source/blender/blenkernel/intern/mesh_remap.c
View File

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