[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41739] trunk/blender/intern/cycles/util/ util_math.h: Cycles: attempt to fix build issue with mingw.

[Brecht Van Lommel]

Revision: 41739
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41739
Author:   blendix
Date:     2011-11-10 14:53:56 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Cycles: attempt to fix build issue with mingw.

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_math.h

Modified: trunk/blender/intern/cycles/util/util_math.h
===================================================================
--- trunk/blender/intern/cycles/util/util_math.h	2011-11-10 14:32:16 UTC (rev 41738)
+++ trunk/blender/intern/cycles/util/util_math.h	2011-11-10 14:53:56 UTC (rev 41739)
@@ -766,7 +766,7 @@
 
 /* Interpolation */
 
-template<class A, class B> __device_inline A lerp(const A& a, const A& b, const B& t)
+template<class A, class B> A lerp(const A& a, const A& b, const B& t)
 {
 	return (A)(a * ((B)1 - t) + b * t);
 }