[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45918] branches/soc-2011-tomato/intern/ cycles/util/util_math.h: Cycles: cuda build fix.

[Brecht Van Lommel]

Revision: 45918
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45918
Author:   blendix
Date:     2012-04-24 12:01:24 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Cycles: cuda build fix.

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/util/util_math.h

Modified: branches/soc-2011-tomato/intern/cycles/util/util_math.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_math.h	2012-04-24 11:52:58 UTC (rev 45917)
+++ branches/soc-2011-tomato/intern/cycles/util/util_math.h	2012-04-24 12:01:24 UTC (rev 45918)
@@ -680,6 +680,10 @@
 	return make_float4(max(a.x, b.x), max(a.y, b.y), max(a.z, b.z), max(a.w, b.w));
 }
 
+#endif
+
+#ifndef __KERNEL_GPU__
+
 __device_inline float4 select(const int4& mask, const float4& a, const float4& b)
 {
 	return make_float4((mask.x)? a.x: b.x, (mask.y)? a.y: b.y, (mask.z)? a.z: b.z, (mask.w)? a.w: b.w);
@@ -705,10 +709,6 @@
 	return make_float3(1.0f/a.x, 1.0f/a.y, 1.0f/a.z);
 }
 
-#endif
-
-#ifndef __KERNEL_GPU__
-
 __device_inline void print_float4(const char *label, const float4& a)
 {
 	printf("%s: %.8f %.8f %.8f %.8f\n", label, a.x, a.y, a.z, a.w);