diff options
| author | Germano <germano.costa@ig.com.br> | 2018-05-04 13:44:34 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-05-04 13:44:34 +0300 |
| commit | a0f369bc13022fe3773420edc87424eefb8a0300 (patch) | |
| tree | 742f17843a5c9ddc9c2d9b80d6820a155e30a2b4 /source/blender/blenkernel/intern/constraint.c | |
| parent | c2fe75bf262f373bd05a00683276205d7e66675d (diff) | |
| parent | b886cdf81d94edb62cac73578fa8ab9ede623452 (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index b192cb7cef2..c2c72e290eb 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3485,15 +3485,15 @@ static void shrinkwrap_get_tarmat(struct Depsgraph *UNUSED(depsgraph), bConstrai break; } - bvhtree_from_mesh_looptri(&treeData, target, scon->dist, 4, 6); + bvhtree_from_mesh_get(&treeData, target, BVHTREE_FROM_LOOPTRI, 4); if (treeData.tree == NULL) { fail = true; break; } - - if (BKE_shrinkwrap_project_normal(0, co, no, &transform, treeData.tree, &hit, - treeData.raycast_callback, &treeData) == false) + treeData.sphere_radius = scon->dist; + if (BKE_shrinkwrap_project_normal(0, co, no, treeData.sphere_radius, &transform, treeData.tree, + &hit, treeData.raycast_callback, &treeData) == false) { fail = true; break; |