diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 18:53:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 18:53:56 +0400 |
| commit | 9dcf4bf0a6887b625678311a0c3b72ab6a7d311c (patch) | |
| tree | 53501d2ef028c23848a3c592d11a0130eeaeb0c9 /intern/cycles | |
| parent | 5b1a42cb17e13af08803a61eb65ce7e068ecb127 (diff) | |
Cycles: attempt to fix build issue with mingw.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/util/util_math.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<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); } |