diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-06 14:32:07 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-06 14:32:07 +0400 |
| commit | 08deeee455c7835245f24909aada05ce61a12c25 (patch) | |
| tree | 07ccc27591f7732cd148a46e08956eea33e737dc /source/blender/render/intern/raytrace | |
| parent | c93127d06fd7fc0219ec103bfab94b11cc13f9e0 (diff) | |
One last try - this should fix the remaining issues:
* Made bvh_node_merge() in svbvh.h static (fix suggested by jaguarandi). This makes mingw link again.
* Also, patched my previous fix for ... = {}; since mingw didn't like the other fix (which was for msvc).
Diffstat (limited to 'source/blender/render/intern/raytrace')
| -rw-r--r-- | source/blender/render/intern/raytrace/svbvh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h index 5837d51d3d4..0303740ee9d 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<> -void bvh_node_merge_bb<SVBVHNode>(SVBVHNode *node, float *min, float *max) +static void bvh_node_merge_bb<SVBVHNode>(SVBVHNode *node, float *min, float *max) { if(is_leaf(node)) { |