diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-06-16 00:35:38 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-06-16 00:35:38 +0300 |
| commit | 888ed6b7f15bf30f978fabc134e1d35cf9fcee38 (patch) | |
| tree | d786a7d797d14da7bc1bce472b6b6a9ca5915859 /intern | |
| parent | 099aaea447e13e186765dafe179f4b7aff948da6 (diff) | |
Cleanup comment and remove now redundant define.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_branched.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h index 6190cd57f17..3fa38a60dd6 100644 --- a/intern/cycles/kernel/kernel_path_branched.h +++ b/intern/cycles/kernel/kernel_path_branched.h @@ -56,7 +56,7 @@ ccl_device void kernel_branched_path_ao(KernelGlobals *kg, ShaderData *sd, PathR } -/* branched path tracing: bounce off surface and integrate indirect light */ +/* bounce off surface and integrate indirect light */ ccl_device_noinline void kernel_branched_path_surface_indirect_light(KernelGlobals *kg, RNG *rng, ShaderData *sd, float3 throughput, float num_samples_adjust, PathState *state, PathRadiance *L) @@ -161,7 +161,7 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg, } #endif -#if defined(__EMISSION__) && defined(__BRANCHED_PATH__) +#ifdef __EMISSION__ /* direct light */ if(kernel_data.integrator.use_direct_light) { bool all = kernel_data.integrator.sample_all_lights_direct; |