archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix BLI_bvhtree_overlap_ex assert

Browse Source
This commit is contained in:
Germano Cavalcante
2019-09-13 12:01:21 -03:00
parent 23a4149778
commit f7e8b58098
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@@ -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;