diff options
-rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_displace.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index 82450b73097..b4f6dcdace9 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -411,6 +411,7 @@ ccl_device_inline void path_radiance_accum_sample(PathRadiance *L, PathRadiance { float fac = 1.0f/num_samples; +#ifdef __PASSES__ L->direct_diffuse += L_sample->direct_diffuse*fac; L->direct_glossy += L_sample->direct_glossy*fac; L->direct_transmission += L_sample->direct_transmission*fac; @@ -426,6 +427,9 @@ ccl_device_inline void path_radiance_accum_sample(PathRadiance *L, PathRadiance L->ao += L_sample->ao*fac; L->shadow += L_sample->shadow*fac; L->mist += L_sample->mist*fac; +#else + *L += *L_sample * fac; +#endif } CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h index 4727e90a231..b8c64af658f 100644 --- a/intern/cycles/kernel/kernel_displace.h +++ b/intern/cycles/kernel/kernel_displace.h @@ -201,6 +201,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, break; } +#ifdef __PASSES__ /* light passes */ case SHADER_EVAL_AO: { @@ -269,6 +270,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, #endif break; } +#endif /* extra */ case SHADER_EVAL_ENVIRONMENT: |