diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 15:40:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 15:40:00 +0300 |
| commit | 5659d8bc0aa334aee20f29548e048f3002f1cff6 (patch) | |
| tree | 924286c8a2cac613491de5fabb6208192960f58a /source/blender/modifiers/intern | |
| parent | 23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff) | |
| parent | 522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surface.c | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 8bae5c3e6bc..2bcab0a4a3d 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -158,9 +158,9 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, surmd->bvhtree = MEM_callocN(sizeof(BVHTreeFromMesh), "BVHTreeFromMesh"); if (surmd->dm->getNumPolys(surmd->dm)) - bvhtree_from_mesh_looptri(surmd->bvhtree, surmd->dm, 0.0, 2, 6); + bvhtree_from_mesh_get(surmd->bvhtree, surmd->dm, BVHTREE_FROM_LOOPTRI); else - bvhtree_from_mesh_edges(surmd->bvhtree, surmd->dm, 0.0, 2, 6); + bvhtree_from_mesh_get(surmd->bvhtree, surmd->dm, BVHTREE_FROM_EDGES); } } diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 317bf3d8d20..e4b40fb7e2a 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -949,7 +949,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos) return false; } - bvhtree_from_mesh_looptri(&treeData, tdm, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData, tdm, BVHTREE_FROM_LOOPTRI); if (treeData.tree == NULL) { modifier_setError((ModifierData *)smd, "Out of memory"); freeAdjacencyMap(vert_edges, adj_array, edge_polys); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 7c94d555106..735c8fe4d16 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -148,7 +148,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3], if (dist_v) { /* Create a bvh-tree of the given target's verts. */ - bvhtree_from_mesh_verts(&treeData_v, target, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData_v, target, BVHTREE_FROM_VERTS); if (treeData_v.tree == NULL) { OUT_OF_MEMORY(); return; @@ -156,7 +156,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3], } if (dist_e) { /* Create a bvh-tree of the given target's edges. */ - bvhtree_from_mesh_edges(&treeData_e, target, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData_e, target, BVHTREE_FROM_EDGES); if (treeData_e.tree == NULL) { OUT_OF_MEMORY(); return; @@ -164,7 +164,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3], } if (dist_f) { /* Create a bvh-tree of the given target's faces. */ - bvhtree_from_mesh_looptri(&treeData_f, target, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData_f, target, BVHTREE_FROM_LOOPTRI); if (treeData_f.tree == NULL) { OUT_OF_MEMORY(); return; |