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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-12 20:33:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-03-25 15:55:42 +0300
commit700722f68633d270584af5463a804742537e30ed (patch)
tree5b80a5a51dd278e649647f8d0a64c07d570e8eaa /intern/cycles/kernel/kernels/opencl
parent0e47e0cc9e9b19a30717042d97cb3b8fb50132ff (diff)
Cycles: Cleanup, indent nested preprocessor directives
Quite straightforward, main trick is happening in path_source_replace_includes(). Reviewers: brecht, dingto, lukasstockner97, juicyfruit Differential Revision: https://developer.blender.org/D1794
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl')
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel.cl22
1 files changed, 11 insertions, 11 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl
index bfa1d8e2e8f..aad06ed5c76 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel.cl
@@ -24,21 +24,21 @@
#include "../../kernel_film.h"
#if defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__)
-#include "../../kernel_path.h"
-#include "../../kernel_path_branched.h"
+# include "../../kernel_path.h"
+# include "../../kernel_path_branched.h"
#else /* __COMPILE_ONLY_MEGAKERNEL__ */
/* Include only actually used headers for the case
* when path tracing kernels are not needed.
*/
-#include "../../kernel_random.h"
-#include "../../kernel_differential.h"
-#include "../../kernel_montecarlo.h"
-#include "../../kernel_projection.h"
-#include "../../geom/geom.h"
-
-#include "../../kernel_accumulate.h"
-#include "../../kernel_camera.h"
-#include "../../kernel_shader.h"
+# include "../../kernel_random.h"
+# include "../../kernel_differential.h"
+# include "../../kernel_montecarlo.h"
+# include "../../kernel_projection.h"
+# include "../../geom/geom.h"
+
+# include "../../kernel_accumulate.h"
+# include "../../kernel_camera.h"
+# include "../../kernel_shader.h"
#endif /* defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) */
#include "../../kernel_bake.h"