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/geom/geom_primitive.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/geom/geom_primitive.h')
-rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 30f12d32355..b1b1e919e00 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -109,11 +109,11 @@ ccl_device float3 primitive_tangent(KernelGlobals *kg, ShaderData *sd) { #ifdef __HAIR__ if(ccl_fetch(sd, type) & PRIMITIVE_ALL_CURVE) -#ifdef __DPDU__ +# ifdef __DPDU__ return normalize(ccl_fetch(sd, dPdu)); -#else +# else return make_float3(0.0f, 0.0f, 0.0f); -#endif +# endif #endif /* try to create spherical tangent from generated coordinates */ |