diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
| commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
| tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/blenlib/intern/BLI_kdtree.c | |
| parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
| parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern/BLI_kdtree.c')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_kdtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c index 844f274a81f..800e245d6bd 100644 --- a/source/blender/blenlib/intern/BLI_kdtree.c +++ b/source/blender/blenlib/intern/BLI_kdtree.c @@ -751,7 +751,7 @@ static void deduplicate_recursive(const struct DeDuplicateParams *p, uint i) * although it can still be used as a target. * \returns The numebr of merges found (includes any merges already in the \a duplicates array). * - * \note Merging is always a single step (target indices wont be marked for merging). + * \note Merging is always a single step (target indices wont be marked for merging). */ int BLI_kdtree_calc_duplicates_fast( const KDTree *tree, const float range, bool use_index_order, |