diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 07:30:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 07:30:41 +0400 |
| commit | 29efa969401e886a18ff82d3de403c841568f566 (patch) | |
| tree | 6909aba09f190b8f9f640c578165e474fb692216 /source/blender/blenkernel/intern/editmesh_bvh.c | |
| parent | 640cf6919ff695389459075cc5cf8ff2fe430b6e (diff) | |
style cleanup
Diffstat (limited to 'source/blender/blenkernel/intern/editmesh_bvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editmesh_bvh.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index ab8d223dd71..5b00e5a83ac 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -197,11 +197,13 @@ static void bmbvh_ray_cast_cb(void *userdata, int index, const BVHTreeRay *ray, bmbvh_tri_from_face(tri_cos, ltri, bmcb_data->cos_cage); - isect = ray->radius > 0.0f ? - isect_ray_tri_epsilon_v3(ray->origin, ray->direction, tri_cos[0], tri_cos[1], tri_cos[2], &dist, uv, ray->radius) : - isect_ray_tri_v3(ray->origin, ray->direction, tri_cos[0], tri_cos[1], tri_cos[2], &dist, uv); - if (isect && dist < hit->dist) - { + isect = (ray->radius > 0.0f ? + isect_ray_tri_epsilon_v3(ray->origin, ray->direction, + tri_cos[0], tri_cos[1], tri_cos[2], &dist, uv, ray->radius) : + isect_ray_tri_v3(ray->origin, ray->direction, + tri_cos[0], tri_cos[1], tri_cos[2], &dist, uv)); + + if (isect && dist < hit->dist) { hit->dist = dist; hit->index = index; |