From 9a85013692322f8a821b8228ad552f84d2a215e9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 15 Apr 2010 10:28:32 +0000 Subject: Merge various small changes from render branch: * Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk. --- source/blender/blenlib/BLI_kdopbvh.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/blenlib/BLI_kdopbvh.h') diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h index fc5469df23a..d9e3d7e42c6 100644 --- a/source/blender/blenlib/BLI_kdopbvh.h +++ b/source/blender/blenlib/BLI_kdopbvh.h @@ -32,6 +32,10 @@ #ifndef BLI_KDOPBVH_H #define BLI_KDOPBVH_H +#ifdef __cplusplus +extern "C" { +#endif + #include struct BVHTree; @@ -100,6 +104,9 @@ float BLI_bvhtree_bb_raycast(float *bv, float *light_start, float *light_end, fl /* range query */ int BLI_bvhtree_range_query(BVHTree *tree, const float *co, float radius, BVHTree_RangeQuery callback, void *userdata); +#ifdef __cplusplus +} +#endif #endif // BLI_KDOPBVH_H -- cgit v1.2.3