[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48266] trunk/blender: the mutex struct seems to be different across systems, use memset rather then an initializer value.

[Campbell Barton]

Revision: 48266
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48266
Author:   campbellbarton
Date:     2012-06-25 11:19:38 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
the mutex struct seems to be different across systems, use memset rather then an initializer value.
also quiet warning in cycles.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_triangle.h
    trunk/blender/source/blender/compositor/intern/COM_compositor.cpp

Modified: trunk/blender/intern/cycles/kernel/kernel_triangle.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_triangle.h	2012-06-25 11:13:27 UTC (rev 48265)
+++ trunk/blender/intern/cycles/kernel/kernel_triangle.h	2012-06-25 11:19:38 UTC (rev 48266)
@@ -191,7 +191,7 @@
 		attr_map = kernel_tex_fetch(__attributes_map, ++attr_offset);
 
 	/* return result */
-	return (attr_map.y == ATTR_ELEMENT_NONE)? ATTR_STD_NOT_FOUND: attr_map.z;
+	return (attr_map.y == ATTR_ELEMENT_NONE) ? (int)ATTR_STD_NOT_FOUND : attr_map.z;
 }
 
 __device float4 triangle_motion_vector(KernelGlobals *kg, ShaderData *sd)

Modified: trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2012-06-25 11:13:27 UTC (rev 48265)
+++ trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2012-06-25 11:19:38 UTC (rev 48266)
@@ -33,11 +33,12 @@
 #include "COM_WorkScheduler.h"
 #include "OCL_opencl.h"
 
-static ThreadMutex compositorMutex = {(0)};
+static ThreadMutex compositorMutex;
 static char is_compositorMutex_init = FALSE;
 void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
 {
 	if (is_compositorMutex_init == FALSE) { /// TODO: move to blender startup phase
+		memset(&compositorMutex, 0, sizeof(compositorMutex));
 		BLI_mutex_init(&compositorMutex);
 		OCL_init();
 		WorkScheduler::initialize(); ///TODO: call workscheduler.deinitialize somewhere