diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-12 20:33:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-25 15:55:42 +0300 |
| commit | 700722f68633d270584af5463a804742537e30ed (patch) | |
| tree | 5b80a5a51dd278e649647f8d0a64c07d570e8eaa /intern/cycles/kernel/svm/svm_closure.h | |
| parent | 0e47e0cc9e9b19a30717042d97cb3b8fb50132ff (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/svm/svm_closure.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 22 |
1 files changed, 11 insertions, 11 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); |