[Bf-blender-cvs] [bdf527b] soc-2013-dingto: Merge branch 'master' into soc-2013-dingto

[Brecht Van Lommel]

Commit: bdf527bfec47a55d3a5a75a57f59ce53c641666e
Author: Brecht Van Lommel
Date:   Thu Dec 26 11:18:52 2013 +0100
https://developer.blender.org/rBbdf527bfec47a55d3a5a75a57f59ce53c641666e

Merge branch 'master' into soc-2013-dingto

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



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

diff --cc intern/cycles/kernel/kernel_types.h
index e1cd0e0,fb63ebb..30937ed
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@@ -61,12 -60,9 +61,10 @@@ CCL_NAMESPACE_BEGI
  
  #ifdef __KERNEL_CUDA__
  #define __KERNEL_SHADING__
- #if __CUDA_ARCH__ >= 200
  #define __KERNEL_ADV_SHADING__
  #define __BRANCHED_PATH__
 +//#define __VOLUME__
  #endif
- #endif
  
  #ifdef __KERNEL_OPENCL__