diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-12 02:04:40 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-12 02:04:55 +0400 |
| commit | 2d4de2742c47256ae0b9ce298b5cf3cefe62daee (patch) | |
| tree | 43093cd9563dcd338a4f0a834cefa30819b8d2e5 /intern/cycles | |
| parent | a82d899c13807b22263e355e43dc913ac5a8a870 (diff) | |
Cycles: Disable Branched Path on sm_30 for now, recent Indirect Multi Light addition makes nvcc fail.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index bf79b0aa3bf..551c2dd596e 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -66,7 +66,9 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CUDA__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ +#if __CUDA_ARCH__ != 300 #define __BRANCHED_PATH__ +#endif //#define __VOLUME__ #endif |