diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-18 17:19:16 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-18 17:19:16 +0400 |
commit | 484d765bd49e0b7a3370280f5f3b9dac89e5f699 (patch) | |
tree | 6acf41f68cef0be38aedf2e2240258219dd79b71 /intern/cycles/util/util_math.h | |
parent | 5fc1d9205afc899aa7a3e6d6cffe3ed9deb88eb7 (diff) |
Cycles: attempt to fix internal compile error with some visual studio builds
Diffstat (limited to 'intern/cycles/util/util_math.h')
-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 68668d88d44..05ed8a2d3f6 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -165,7 +165,7 @@ __device_inline float clamp(float a, float mn, float mx) __device_inline int float_to_int(float f) { -#ifdef __KERNEL_SSE2__ +#if defined(__KERNEL_SSE2__) && !defined(_MSC_VER) return _mm_cvtt_ss2si(_mm_load_ss(&f)); #else return (int)f; |