Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürgen Herrmann <shadowrom@me.com>2013-06-18 16:32:43 +0400
committerJürgen Herrmann <shadowrom@me.com>2013-06-18 16:32:43 +0400
commit5fc1d9205afc899aa7a3e6d6cffe3ed9deb88eb7 (patch)
tree7d017fce85e415919a6e9a38beed2309444a61df /intern/cycles/util
parent836b91c9c711b0ce3803f64b3123cdd4d1adc47d (diff)
Cycles BVH Build fix for MSVC 2012.
needs to include intrin.h for _BitScanForward and _BitScanReverse.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_types.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index d4ff95b0663..32529e47c23 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -23,6 +23,11 @@
#include <stdlib.h>
+ // Needed for _BistScanForward and _BitScanReverse on MSVC 2012
+# if defined(_MSC_VER) && _MSC_VER >= 1700
+# include <intrin.h>
+# endif
+
#endif
/* Qualifiers for kernel code shared by CPU and GPU */