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/blenkernel/intern/constraint.c | |
| parent | 23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff) | |
| parent | 522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index b58028b4a5d..12a16e9a8b1 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3431,9 +3431,9 @@ static void shrinkwrap_get_tarmat(struct Depsgraph *UNUSED(depsgraph), bConstrai nearest.dist_sq = FLT_MAX; if (scon->shrinkType == MOD_SHRINKWRAP_NEAREST_VERTEX) - bvhtree_from_mesh_verts(&treeData, target, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData, target, BVHTREE_FROM_VERTS); else - bvhtree_from_mesh_looptri(&treeData, target, 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData, target, BVHTREE_FROM_LOOPTRI); if (treeData.tree == NULL) { fail = true; |