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

One last try - this should fix the remaining issues:

Browse Source 
* 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).
This commit is contained in:
Joshua Leung
2009-10-06 10:32:07 +00:00
parent c93127d06f
commit 08deeee455
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/raytrace/svbvh.h
View File

@@ -76,7 +76,7 @@ inline void bvh_node_push_childs<SVBVHNode>(SVBVHNode *node, Isect *isec, SVBVHN
} }
template<> 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)) if(is_leaf(node))
{ {

4
source/blender/render/intern/source/rayshade.c
View File

@@ -134,7 +134,7 @@ RayObject* RE_rayobject_create(Render *re, int type, int size)
} }
#ifdef RE_RAYCOUNTER #ifdef RE_RAYCOUNTER
RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {0}; RayCounter re_rc_counter[BLENDER_MAX_THREADS];
#endif #endif
@@ -180,7 +180,7 @@ void freeraytree(Render *re)
#ifdef RE_RAYCOUNTER #ifdef RE_RAYCOUNTER
{ {
RayCounter sum = {0}; RayCounter sum;
int i; int i;
for(i=0; i<BLENDER_MAX_THREADS; i++) for(i=0; i<BLENDER_MAX_THREADS; i++)
RE_RC_MERGE(&sum, re_rc_counter+i); RE_RC_MERGE(&sum, re_rc_counter+i);