[Bf-blender-cvs] [2d4de27] master: Cycles: Disable Branched Path on sm_30 for now, recent Indirect Multi Light addition makes nvcc fail.

[Thomas Dinges]

Commit: 2d4de2742c47256ae0b9ce298b5cf3cefe62daee
Author: Thomas Dinges
Date:   Tue Mar 11 23:04:40 2014 +0100
https://developer.blender.org/rB2d4de2742c47256ae0b9ce298b5cf3cefe62daee

Cycles: Disable Branched Path on sm_30 for now, recent Indirect Multi Light addition makes nvcc fail.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index bf79b0a..551c2dd 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