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_motion_triangle.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_motion_triangle.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_motion_triangle.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/geom_motion_triangle.h index 7f3562b4687..ffe55529110 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle.h +++ b/intern/cycles/kernel/geom/geom_motion_triangle.h @@ -133,11 +133,11 @@ ccl_device_inline float3 motion_triangle_refine(KernelGlobals *kg, ShaderData *s if(UNLIKELY(t == 0.0f)) { return P; } -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ Transform tfm = ccl_fetch(sd, ob_itfm); -#else +# else Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_INVERSE_TRANSFORM); -#endif +# endif P = transform_point(&tfm, P); D = transform_direction(&tfm, D*t); @@ -160,11 +160,11 @@ ccl_device_inline float3 motion_triangle_refine(KernelGlobals *kg, ShaderData *s P = P + D*rt; if(isect->object != OBJECT_NONE) { -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ Transform tfm = ccl_fetch(sd, ob_tfm); -#else +# else Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_TRANSFORM); -#endif +# endif P = transform_point(&tfm, P); } @@ -189,13 +189,13 @@ float3 motion_triangle_refine_subsurface(KernelGlobals *kg, ShaderData *sd, cons float3 D = ray->D; float t = isect->t; -#ifdef __INTERSECTION_REFINE__ +# ifdef __INTERSECTION_REFINE__ if(isect->object != OBJECT_NONE) { -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ Transform tfm = ccl_fetch(sd, ob_itfm); -#else +# else Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_INVERSE_TRANSFORM); -#endif +# endif P = transform_point(&tfm, P); D = transform_direction(&tfm, D); @@ -217,19 +217,19 @@ float3 motion_triangle_refine_subsurface(KernelGlobals *kg, ShaderData *sd, cons P = P + D*rt; if(isect->object != OBJECT_NONE) { -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ Transform tfm = ccl_fetch(sd, ob_tfm); -#else +# else Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_TRANSFORM); -#endif +# endif P = transform_point(&tfm, P); } return P; -#else +# else return P + D*t; -#endif +# endif } #endif |