diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 14:52:14 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 14:52:14 +0400 |
| commit | ba3ec58d01a295ebcbcbdbfe0e6568aca34a358c (patch) | |
| tree | 7b01f58d2453b29267c94ffdc27c2f74060a47ad /source/blender/render/intern/raytrace | |
| parent | 08deeee455c7835245f24909aada05ce61a12c25 (diff) | |
*Added memset's to make sure counters start on zero
*Disabled ray counter (can be enabled on render/extern/include/RE_raytrace.h by commenting out the define)
*marked bvh_node_merge() as static inline (hopping it now compiles on gcc and mingw)
Diffstat (limited to 'source/blender/render/intern/raytrace')
| -rw-r--r-- | source/blender/render/intern/raytrace/bvh.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/raytrace/svbvh.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h index 0e74bbc923b..ad7f44acb8d 100644 --- a/source/blender/render/intern/raytrace/bvh.h +++ b/source/blender/render/intern/raytrace/bvh.h @@ -112,7 +112,7 @@ template<class Node> static inline int bvh_node_hit_test(Node *node, Isect *isec template<class Node> -static void bvh_node_merge_bb(Node *node, float *min, float *max) +static inline void bvh_node_merge_bb(Node *node, float *min, float *max) { if(is_leaf(node)) { diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h index 0303740ee9d..5837d51d3d4 100644 --- a/source/blender/render/intern/raytrace/svbvh.h +++ b/source/blender/render/intern/raytrace/svbvh.h @@ -76,7 +76,7 @@ inline void bvh_node_push_childs<SVBVHNode>(SVBVHNode *node, Isect *isec, SVBVHN } template<> -static void bvh_node_merge_bb<SVBVHNode>(SVBVHNode *node, float *min, float *max) +void bvh_node_merge_bb<SVBVHNode>(SVBVHNode *node, float *min, float *max) { if(is_leaf(node)) { |