From 109cbdf2e1b609e93270100239906a8e17c64ab5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Mar 2019 00:46:33 +1100
Subject: Cleanup: use BLI_kdtree_3d prefix

Use prefix now there isn't only the 3d version.
---
 source/blender/blenlib/BLI_kdtree.h         | 6 +++++-
 source/blender/blenlib/intern/kdtree_3d.c   | 6 +++---
 source/blender/blenlib/intern/kdtree_impl.h | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'source/blender/blenlib')

diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h
index eb0421eaec1..af10a448423 100644
--- a/source/blender/blenlib/BLI_kdtree.h
+++ b/source/blender/blenlib/BLI_kdtree.h
@@ -24,9 +24,13 @@
 
 /* 3D version */
 #define KD_DIMS 3
-#define KDTREE_PREFIX_ID BLI_kdtree
+#define KDTREE_PREFIX_ID BLI_kdtree_3d
+#define KDTree KDTree_3d
+#define KDTreeNearest KDTreeNearest_3d
 #include "BLI_kdtree_impl.h"
 #undef KD_DIMS
+#undef KDTree
+#undef KDTreeNearest
 #undef KDTREE_PREFIX_ID
 
 /* 4D version */
diff --git a/source/blender/blenlib/intern/kdtree_3d.c b/source/blender/blenlib/intern/kdtree_3d.c
index 1da93772aa9..2f85755b676 100644
--- a/source/blender/blenlib/intern/kdtree_3d.c
+++ b/source/blender/blenlib/intern/kdtree_3d.c
@@ -19,7 +19,7 @@
  */
 
 #define KD_DIMS 3
-#define KDTREE_PREFIX_ID BLI_kdtree
+#define KDTREE_PREFIX_ID BLI_kdtree_3d
+#define KDTree KDTree_3d
+#define KDTreeNearest KDTreeNearest_3d
 #  include "kdtree_impl.h"
-#undef DIMS
-#undef KDTREE_PREFIX_ID
diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h
index 2d4a657ae81..62bd51eea80 100644
--- a/source/blender/blenlib/intern/kdtree_impl.h
+++ b/source/blender/blenlib/intern/kdtree_impl.h
@@ -325,7 +325,7 @@ int BLI_kdtree_nd_(find_nearest)(
 
 
 /**
- * A version of #BLI_kdtree_find_nearest which runs a callback
+ * A version of #BLI_kdtree_3d_find_nearest which runs a callback
  * to filter out values.
  *
  * \param filter_cb: Filter find results,
@@ -711,7 +711,7 @@ int BLI_kdtree_nd_(range_search)(
 }
 
 /**
- * A version of #BLI_kdtree_range_search which runs a callback
+ * A version of #BLI_kdtree_3d_range_search which runs a callback
  * instead of allocating an array.
  *
  * \param search_cb: Called for every node found in \a range, false return value performs an early exit.
@@ -796,7 +796,7 @@ static uint *kdtree_order(const KDTree *tree)
 }
 
 /* -------------------------------------------------------------------- */
-/** \name BLI_kdtree_calc_duplicates_fast
+/** \name BLI_kdtree_3d_calc_duplicates_fast
  * \{ */
 
 struct DeDuplicateParams {
-- 
cgit v1.2.3