diff options
| author | Germano <germano.costa@ig.com.br> | 2018-05-15 20:37:45 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-05-15 20:37:45 +0300 |
| commit | 7a69c59b35bea8d027426a3aef853abbc3c08275 (patch) | |
| tree | 21cbb2d1b6d3865d7b8aa029a5c8b42810aaa0ac /source/blender/blenlib | |
| parent | 50c29e239114b7f5dd533ec080fc75f4fbda6a99 (diff) | |
Revert "BLI_kdopbvh: Reference clip_planes callback to find nearest projected."
This reverts commit 717dd4cecd2ea8eaa7b3bbfb5a5c7ec65f0337c0.
It was causing problems in the protactor ruler.
I'll think of a better solution.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_kdopbvh.h | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h index e7cbe05d713..76c3b6ef3fd 100644 --- a/source/blender/blenlib/BLI_kdopbvh.h +++ b/source/blender/blenlib/BLI_kdopbvh.h @@ -107,7 +107,6 @@ typedef void (*BVHTree_RangeQuery)(void *userdata, int index, const float co[3], typedef void (*BVHTree_NearestProjectedCallback)( void *userdata, int index, const struct DistProjectedAABBPrecalc *precalc, - const float (*clip_plane)[4], const int clip_plane_len, BVHTreeNearest *nearest); diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index b3adf3106c1..5571636be63 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -2040,10 +2040,7 @@ static void bvhtree_nearest_projected_dfs_recursive( { if (node->totnode == 0) { if (data->callback) { - data->callback( - data->userdata, node->index, &data->precalc, - NULL, 0, - &data->nearest); + data->callback(data->userdata, node->index, &data->precalc, &data->nearest); } else { data->nearest.index = node->index; @@ -2092,10 +2089,7 @@ static void bvhtree_nearest_projected_with_clipplane_test_dfs_recursive( { if (node->totnode == 0) { if (data->callback) { - data->callback( - data->userdata, node->index, &data->precalc, - data->clip_plane, data->clip_plane_len, - &data->nearest); + data->callback(data->userdata, node->index, &data->precalc, &data->nearest); } else { data->nearest.index = node->index; |