diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-20 12:22:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-20 12:37:14 +0300 |
| commit | 3ec9ff16f888cc30b5fe728953a8368d0a2c0275 (patch) | |
| tree | 1d474ddbf3c70eea0c0f15246abdb37d3ae9a8ff /source/blender/blenlib/BLI_kdopbvh.h | |
| parent | 179a2e1b98b048e5b9f607eee23f94f22d8234aa (diff) | |
Resolve MSVC/OpenMP compat issue
Diffstat (limited to 'source/blender/blenlib/BLI_kdopbvh.h')
| -rw-r--r-- | source/blender/blenlib/BLI_kdopbvh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h index 6fc93ca9cdb..ce7f3ab25fe 100644 --- a/source/blender/blenlib/BLI_kdopbvh.h +++ b/source/blender/blenlib/BLI_kdopbvh.h @@ -75,7 +75,7 @@ typedef void (*BVHTree_NearestPointCallback)(void *userdata, int index, const fl typedef void (*BVHTree_RayCastCallback)(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit); /* callback to check if 2 nodes overlap (use thread if intersection results need to be stored) */ -typedef bool (*BVHTree_OverlapCallback)(void *userdata, int index_a, int index_b, unsigned int thread); +typedef bool (*BVHTree_OverlapCallback)(void *userdata, int index_a, int index_b, int thread); /* callback to range search query */ typedef void (*BVHTree_RangeQuery)(void *userdata, int index, float dist_sq); @@ -91,7 +91,7 @@ void BLI_bvhtree_balance(BVHTree *tree); bool BLI_bvhtree_update_node(BVHTree *tree, int index, const float co[3], const float co_moving[3], int numpoints); void BLI_bvhtree_update_tree(BVHTree *tree); -unsigned int BLI_bvhtree_overlap_thread_num(const BVHTree *tree); +int BLI_bvhtree_overlap_thread_num(const BVHTree *tree); /* collision/overlap: check two trees if they overlap, alloc's *overlap with length of the int return value */ BVHTreeOverlap *BLI_bvhtree_overlap( |