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

3 files changed, 20 insertions, 20 deletions

diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index b24873d9839..3b8db6a2742 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -436,11 +436,11 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 #endif
 
 #ifdef __SUBSURFACE__
-#ifndef __SPLIT_KERNEL__
-#  define sc_next(sc) sc++
-#else
-#  define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd, num_closure))
-#endif
+#  ifndef __SPLIT_KERNEL__
+#    define sc_next(sc) sc++
+#  else
+#    define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd, num_closure))
+#  endif
 		case CLOSURE_BSSRDF_CUBIC_ID:
 		case CLOSURE_BSSRDF_GAUSSIAN_ID:
 		case CLOSURE_BSSRDF_BURLEY_ID: {
@@ -471,9 +471,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					sc->data1 = texture_blur;
 					sc->data2 = albedo.x;
 					sc->T.x = sharpness;
-#ifdef __OSL__
+#  ifdef __OSL__
 					sc->prim = NULL;
-#endif
+#  endif
 					sc->N = N;
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)type);
 
@@ -488,9 +488,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					sc->data1 = texture_blur;
 					sc->data2 = albedo.y;
 					sc->T.x = sharpness;
-#ifdef __OSL__
+#  ifdef __OSL__
 					sc->prim = NULL;
-#endif
+#  endif
 					sc->N = N;
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)type);
 
@@ -505,9 +505,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					sc->data1 = texture_blur;
 					sc->data2 = albedo.z;
 					sc->T.x = sharpness;
-#ifdef __OSL__
+#  ifdef __OSL__
 					sc->prim = NULL;
-#endif
+#  endif
 					sc->N = N;
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)type);
 
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 86d3262795f..8f2b9423b2c 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -133,13 +133,13 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb, uint use_alpha)
 {
 #ifdef __KERNEL_CPU__
-#ifdef __KERNEL_SSE2__
+#  ifdef __KERNEL_SSE2__
 	ssef r_ssef;
 	float4 &r = (float4 &)r_ssef;
 	r = kernel_tex_image_interp(id, x, y);
-#else
+#  else
 	float4 r = kernel_tex_image_interp(id, x, y);
-#endif
+#  endif
 #else
 	float4 r;
 
@@ -247,7 +247,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 91: r = kernel_tex_image_interp(__tex_image_091, x, y); break;
 		case 92: r = kernel_tex_image_interp(__tex_image_092, x, y); break;
 
-#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
+#  if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
 		case 93: r = kernel_tex_image_interp(__tex_image_093, x, y); break;
 		case 94: r = kernel_tex_image_interp(__tex_image_094, x, y); break;
 		case 95: r = kernel_tex_image_interp(__tex_image_095, x, y); break;
@@ -306,7 +306,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 148: r = kernel_tex_image_interp(__tex_image_148, x, y); break;
 		case 149: r = kernel_tex_image_interp(__tex_image_149, x, y); break;
 		case 150: r = kernel_tex_image_interp(__tex_image_150, x, y); break;
-#endif
+#  endif
 
 		default:
 			kernel_assert(0);
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index c77c2a1c482..3f75ae5c04e 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -90,8 +90,8 @@ ccl_device uint hash(uint kx, uint ky, uint kz)
 #ifdef __KERNEL_SSE2__
 ccl_device_inline ssei hash_sse(const ssei& kx, const ssei& ky, const ssei& kz)
 {
-#define rot(x,k) (((x)<<(k)) | (srl(x, 32-(k))))
-#define xor_rot(a, b, c) do {a = a^b; a = a - rot(b, c);} while(0)
+#  define rot(x,k) (((x)<<(k)) | (srl(x, 32-(k))))
+#  define xor_rot(a, b, c) do {a = a^b; a = a - rot(b, c);} while(0)
 
 	uint len = 3;
 	ssei magic = ssei(0xdeadbeef + (len << 2) + 13);
@@ -108,8 +108,8 @@ ccl_device_inline ssei hash_sse(const ssei& kx, const ssei& ky, const ssei& kz)
 	xor_rot(c, b, 24);
 
 	return c;
-#undef rot
-#undef xor_rot
+#  undef rot
+#  undef xor_rot
 }
 #endif