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/MOD_surface.c | |
| parent | 23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff) | |
| parent | 522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_surface.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surface.c | 4 |
1 files changed, 2 insertions, 2 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); } } |