diff options
author | mano-wii <germano.costa@ig.com.br> | 2019-09-13 18:01:21 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2019-09-13 18:19:54 +0300 |
commit | f7e8b580989ec70d1cf8f15a11d4f09e6b36f407 (patch) | |
tree | 24de0ad96ecc66f9b07a594b586993c00b75de58 | |
parent | 23a4149778c879d8a57edd211efefa8a740abd52 (diff) |
Fix `BLI_bvhtree_overlap_ex` assert
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |