diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-11 18:36:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-11 18:36:51 +0400 |
| commit | df74230c5e32253b9abd136dca071947d6f0b891 (patch) | |
| tree | c318105a09d362d521a0b213f92479a027c33bc5 /intern/cycles/kernel/kernel_accumulate.h | |
| parent | 0d5ecc5c3339f9fede6e7d2bc60315e4b4743cd2 (diff) | |
Fix cycles baking code build errors with OpenCL on some platforms.
Diffstat (limited to 'intern/cycles/kernel/kernel_accumulate.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 4 |
1 files changed, 4 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 |