diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-04 05:04:14 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-04 05:04:14 +0400 |
| commit | efe779315247874c8893e052f4fe48996da68116 (patch) | |
| tree | eec70308f880bb68b160d0f0c5628f66e3c2ecea | |
| parent | af9a6aad990a86b34d5be0ee4c48554f10261eae (diff) | |
Fix cycles CUDA/OpenCL build error after recent change.
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_subsurface.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index 45ccac59408..d81bbebd5a8 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -28,7 +28,9 @@ #endif #include "../closure/bsdf_westin.h" #include "../closure/bsdf_toon.h" +#ifdef __SUBSURFACE__ #include "../closure/bssrdf.h" +#endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h index 2c394327f21..4567f2ff0ce 100644 --- a/intern/cycles/kernel/kernel_subsurface.h +++ b/intern/cycles/kernel/kernel_subsurface.h @@ -16,15 +16,11 @@ CCL_NAMESPACE_BEGIN -#include "closure/bssrdf.h" - /* NEW BSSRDF: See "BSSRDF Importance Sampling", SIGGRAPH 2013 */ /* TODO: * - test using power heuristic for combing bssrdfs * - try to reduce one sample model variance - * - possible shade all hits for progressive integrator - * - cubic and gaussian scale difference tweak */ #define BSSRDF_MULTI_EVAL |