diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-11-29 03:53:23 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-29 03:53:23 +0300 |
| commit | abd16aac5af56a37a3435b94039d77b74223abab (patch) | |
| tree | 47ba926d0e8e2c3a903a5d2f1b8290d274cb381c /source/blender/blenkernel/intern/bvhutils.c | |
| parent | 3d0db91f820a509bc6c93718499ffe8ff49515d3 (diff) | |
| parent | d459c9c9abd2ad0819e5c096f6e3e5a93a02a219 (diff) | |
ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
Diffstat (limited to 'source/blender/blenkernel/intern/bvhutils.c')
| -rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 9701bc41175..6a3c416bbab 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -492,8 +492,9 @@ static void mesh_edges_nearest_point(void *userdata, int index, const float *co, t0 = vert[ edge->v1 ].co; t1 = vert[ edge->v2 ].co; - closest_to_line_segment_v3(nearest_tmp, co, t0, t1); - dist = len_v3v3(nearest_tmp, co); + // NOTE: casts to "float*" here are due to co being "const float*" + closest_to_line_segment_v3(nearest_tmp, (float*)co, t0, t1); + dist = len_v3v3(nearest_tmp, (float*)co); if(dist < nearest->dist) { |