Merge branch 'master' into dyntopo_holesdyntopo_holes

Conflicts:
	source/blender/blenkernel/intern/pbvh_bmesh.c

1 files changed, 7 insertions, 5 deletions

diff --git a/extern/rangetree/range_tree_c_api.h b/extern/rangetree/range_tree_c_api.h
index af6a7b161a8..f0a2af4a29a 100644
--- a/extern/rangetree/range_tree_c_api.h
+++ b/extern/rangetree/range_tree_c_api.h
@@ -35,17 +35,19 @@ void range_tree_uint_free(RangeTreeUInt *rt);
 
 void range_tree_uint_take(RangeTreeUInt *rt, unsigned v);
 
+bool range_tree_uint_retake(RangeTreeUInt *rt, unsigned v);
+
 unsigned range_tree_uint_take_any(RangeTreeUInt *rt);
 
 void range_tree_uint_release(RangeTreeUInt *rt, unsigned v);
 
-int range_tree_uint_has(const RangeTreeUInt *rt, unsigned v);
+bool range_tree_uint_has(const RangeTreeUInt *rt, unsigned v);
 
-int range_tree_uint_has_range(const RangeTreeUInt *rt,
-							  unsigned vmin,
-							  unsigned vmax);
+bool range_tree_uint_has_range(
+        const RangeTreeUInt *rt,
+        unsigned vmin, unsigned vmax);
 
-int range_tree_uint_empty(const RangeTreeUInt *rt);
+bool range_tree_uint_empty(const RangeTreeUInt *rt);
 
 unsigned range_tree_uint_size(const RangeTreeUInt *rt);