[Bf-blender-cvs] [2d98b198e95] master: Cycles: Cleanup, indentation in preprocessor
Sergey Sharybin
noreply at git.blender.org
Fri Nov 9 14:33:53 CET 2018
Commit: 2d98b198e95b10dfea3fc83fd6accd6c5044b991
Author: Sergey Sharybin
Date: Fri Nov 9 12:12:11 2018 +0100
Branches: master
https://developer.blender.org/rB2d98b198e95b10dfea3fc83fd6accd6c5044b991
Cycles: Cleanup, indentation in preprocessor
===================================================================
M intern/cycles/kernel/bvh/bvh.h
===================================================================
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index 798bccc9929..72bba8d968f 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -26,7 +26,7 @@
* with CPU/CUDA/OpenCL. */
#ifdef __EMBREE__
-#include "kernel/bvh/bvh_embree.h"
+# include "kernel/bvh/bvh_embree.h"
#endif
CCL_NAMESPACE_BEGIN
@@ -36,9 +36,9 @@ CCL_NAMESPACE_BEGIN
/* Common QBVH functions. */
#ifdef __QBVH__
# include "kernel/bvh/qbvh_nodes.h"
-#ifdef __KERNEL_AVX2__
-# include "kernel/bvh/obvh_nodes.h"
-#endif
+# ifdef __KERNEL_AVX2__
+# include "kernel/bvh/obvh_nodes.h"
+# endif
#endif
/* Regular BVH traversal */
More information about the Bf-blender-cvs
mailing list