Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 14:25:40 +0000 (11:25 -0300)
committerGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 14:25:40 +0000 (11:25 -0300)
source/blender/blenkernel/intern/bvhutils.c

index 181afdcaf1edca9987456f669891b42cfacc83d9..938f185a1113ddbafc46e2ac13f7cb5804d3ae25 100644 (file)
@@ -1131,8 +1131,8 @@ BVHTree *bvhtree_from_mesh_get(
 #endif
                data->tree = tree;
 
-               data->nearest_callback = mesh_looptri_nearest_point;
-               data->raycast_callback = mesh_looptri_spherecast;
+               data->nearest_callback = nearest_callback;
+               data->raycast_callback = raycast_callback;
 
                data->vert = mvert;
                data->edge = medge;