[Bf-blender-cvs] [f7e8b580989] master: Fix `BLI_bvhtree_overlap_ex` assert

mano-wii noreply at git.blender.org
Fri Sep 13 17:20:39 CEST 2019


Commit: f7e8b580989ec70d1cf8f15a11d4f09e6b36f407
Author: mano-wii
Date:   Fri Sep 13 12:01:21 2019 -0300
Branches: master
https://developer.blender.org/rBf7e8b580989ec70d1cf8f15a11d4f09e6b36f407

Fix `BLI_bvhtree_overlap_ex` assert

===================================================================

M	source/blender/blenlib/intern/BLI_kdopbvh.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 88dc9e780e4..ae862c5ece5 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1284,12 +1284,12 @@ BVHTreeOverlap *BLI_bvhtree_overlap_ex(
     void *userdata,
     int flag)
 {
-  bool use_threading = flag & BVH_OVERLAP_USE_THREADING;
-  bool overlap_pairs = flag & BVH_OVERLAP_RETURN_PAIRS;
-  bool break_on_first = flag & BVH_OVERLAP_BREAK_ON_FIRST;
+  bool use_threading = (flag & BVH_OVERLAP_USE_THREADING) != 0;
+  bool overlap_pairs = (flag & BVH_OVERLAP_RETURN_PAIRS) != 0;
+  bool break_on_first = (flag & BVH_OVERLAP_BREAK_ON_FIRST) != 0;
 
-  /* Skip `RETURN_PAIRS` was not implemented without `BREAK_ON_FIRST`. */
-  BLI_assert(!((flag & BVH_OVERLAP_RETURN_PAIRS) && (flag & ~BVH_OVERLAP_BREAK_ON_FIRST)));
+  /* `RETURN_PAIRS` was not implemented without `BREAK_ON_FIRST`. */
+  BLI_assert(overlap_pairs || break_on_first);
 
   const int thread_num = BLI_bvhtree_overlap_thread_num(tree1);
   int j;



More information about the Bf-blender-cvs mailing list