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/kernel_emission.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/kernel_emission.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 4e662f52150..5cf52f9d176 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -40,9 +40,9 @@ ccl_device_noinline float3 direct_emissive_eval(KernelGlobals *kg, ray.D = ls->D; ray.P = ls->P; ray.t = 1.0f; -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ ray.time = time; -#endif +# endif ray.dP = differential3_zero(); ray.dD = dI; @@ -278,21 +278,21 @@ ccl_device_noinline float3 indirect_background(KernelGlobals *kg, } /* evaluate background closure */ -#ifdef __SPLIT_KERNEL__ +# ifdef __SPLIT_KERNEL__ Ray priv_ray = *ray; shader_setup_from_background(kg, kg->sd_input, &priv_ray); path_state_modify_bounce(state, true); float3 L = shader_eval_background(kg, kg->sd_input, state, state->flag, SHADER_CONTEXT_EMISSION); path_state_modify_bounce(state, false); -#else +# else ShaderData sd; shader_setup_from_background(kg, &sd, ray); path_state_modify_bounce(state, true); float3 L = shader_eval_background(kg, &sd, state, state->flag, SHADER_CONTEXT_EMISSION); path_state_modify_bounce(state, false); -#endif +# endif #ifdef __BACKGROUND_MIS__ /* check if background light exists or if we should skip pdf */ |