[Bf-blender-cvs] [e827d90] master: Move include outside of the CCL namespace

Sergey Sharybin noreply at git.blender.org
Tue Aug 26 20:11:14 CEST 2014


Commit: e827d904ae36a1b260ca2bfb04df23077edf66f4
Author: Sergey Sharybin
Date:   Wed Aug 27 00:10:48 2014 +0600
Branches: master
https://developer.blender.org/rBe827d904ae36a1b260ca2bfb04df23077edf66f4

Move include outside of the CCL namespace

===================================================================

M	intern/cycles/kernel/kernel_jitter.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h
index 15fd1da..3b68b11 100644
--- a/intern/cycles/kernel/kernel_jitter.h
+++ b/intern/cycles/kernel/kernel_jitter.h
@@ -14,6 +14,11 @@
  * limitations under the License
  */
 
+/* TODO(sergey): Consider moving portable ctz/clz stuff to util. */
+#ifdef _MSC_VER
+#  include <intrin.h>
+#endif
+
 CCL_NAMESPACE_BEGIN
 
 /* "Correlated Multi-Jittered Sampling"
@@ -22,11 +27,6 @@ CCL_NAMESPACE_BEGIN
 /* todo: find good value, suggested 64 gives pattern on cornell box ceiling */
 #define CMJ_RANDOM_OFFSET_LIMIT 4096
 
-/* TODO(sergey): Consider moving portable ctz/clz stuff to util. */
-#ifdef _MSC_VER
-#  include <intrin.h>
-#endif
-
 ccl_device_inline bool cmj_is_pow2(int i)
 {
 	return (i & (i - 1)) == 0;




More information about the Bf-blender-cvs mailing list