diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-04 23:00:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-04 23:00:13 +0400 |
| commit | ca7197b6209b82af4b87f851bf5d6becdb7625b2 (patch) | |
| tree | 65ef2d71a5ec602c05d3bdb0185c5fea77189424 /intern/cycles/kernel/kernel_types.h | |
| parent | 5024996eea206252adc098f44c9a3a1d01ae6167 (diff) | |
Cycles / OSL:
* __OSL__ is now defined for CPU when building with OSL.
* First batch of compile fixes, remove some unneeded std namespace declarations and added missing includes.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index d119057ac67..4fd57a5f2b3 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -39,6 +39,9 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CPU__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ +#ifdef WITH_OSL +#define __OSL__ +#endif #endif #ifdef __KERNEL_CUDA__ @@ -107,7 +110,6 @@ CCL_NAMESPACE_BEGIN #endif //#define __MULTI_LIGHT__ -//#define __OSL__ //#define __SOBOL_FULL_SCREEN__ //#define __QBVH__ |