[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23655] trunk/blender/source/blender/ render/intern: One last try - this should fix the remaining issues:

[Joshua Leung]

Revision: 23655
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23655
Author:   aligorith
Date:     2009-10-06 12:32:07 +0200 (Tue, 06 Oct 2009)

Log Message:
-----------
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).  

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/raytrace/svbvh.h
    trunk/blender/source/blender/render/intern/source/rayshade.c

Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/svbvh.h	2009-10-06 10:23:25 UTC (rev 23654)
+++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h	2009-10-06 10:32:07 UTC (rev 23655)
@@ -76,7 +76,7 @@
 }
 
 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))
 	{

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2009-10-06 10:23:25 UTC (rev 23654)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2009-10-06 10:32:07 UTC (rev 23655)
@@ -134,7 +134,7 @@
 }
 
 #ifdef RE_RAYCOUNTER
-RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {0};
+RayCounter re_rc_counter[BLENDER_MAX_THREADS];
 #endif
 
 
@@ -180,7 +180,7 @@
 	
 #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);