One last try - this should fix the remaining issues:
authorJoshua Leung <aligorith@gmail.com>
Tue, 6 Oct 2009 10:32:07 +0000 (10:32 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 6 Oct 2009 10:32:07 +0000 (10:32 +0000)
* 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).

source/blender/render/intern/raytrace/svbvh.h
source/blender/render/intern/source/rayshade.c

index 5837d51d3d40741f4cc018001990714ca2864146..0303740ee9d7054742e418bbc549015dc2306a72 100644 (file)
@@ -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))
        {
index 8c0920a93fa12946fd93483bfeb123bb89653008..7886e237c979787b00d8ca033d53d771460b830c 100644 (file)
@@ -134,7 +134,7 @@ RayObject*  RE_rayobject_create(Render *re, int type, int size)
 }
 
 #ifdef RE_RAYCOUNTER
-RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {0};
+RayCounter re_rc_counter[BLENDER_MAX_THREADS];
 #endif
 
 
@@ -180,7 +180,7 @@ void freeraytree(Render *re)
        
 #ifdef RE_RAYCOUNTER
        {
-               RayCounter sum = {0};
+               RayCounter sum;
                int i;
                for(i=0; i<BLENDER_MAX_THREADS; i++)
                        RE_RC_MERGE(&sum, re_rc_counter+i);