From 9dcf4bf0a6887b625678311a0c3b72ab6a7d311c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 10 Nov 2011 14:53:56 +0000 Subject: [PATCH] Cycles: attempt to fix build issue with mingw. --- intern/cycles/util/util_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 38e90f0b2b2..c0dd627a606 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -766,7 +766,7 @@ __device_inline float __uint_as_float(uint i) /* Interpolation */ -template __device_inline A lerp(const A& a, const A& b, const B& t) +template A lerp(const A& a, const A& b, const B& t) { return (A)(a * ((B)1 - t) + b * t); }