Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-08-25 19:22:47 +0400
committerThomas Dinges <blender@dingto.org>2014-08-25 19:23:06 +0400
commit8d0b3e9902540a354b633c854f0fa83a0c839dfd (patch)
tree49e84eb46da478abebab3990310f862e33f963ba /intern/cycles/kernel/kernel_types.h
parent3ba28a2609dd97c658e815c3a89be69b63ef20f9 (diff)
Cycles: Enable Volumetric Rendering on GPU.
Limitations: * Smoke/Fire rendering is *not* supported on GPU yet, that is also documented here: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Materials/Volume * Decoupled Ray Marching is also not supported yet, so no Equi-Angular and MIS sampling yet. Note for Builders and Developers: * Make sure to use the CUDA Toolkit 6.5 from now on. 6.0 might still work, but can cause slower renders.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
-rw-r--r--intern/cycles/kernel/kernel_types.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 3a54c6806be..1ed4281ea75 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -75,10 +75,11 @@ CCL_NAMESPACE_BEGIN
#define __KERNEL_SHADING__
#define __KERNEL_ADV_SHADING__
#define __BRANCHED_PATH__
+#define __VOLUME__
+#define __VOLUME_SCATTER__
/* Experimental on GPU */
-//#define __VOLUME__
-//#define __VOLUME_SCATTER__
+//#define __VOLUME_DECOUPLED__
//#define __SUBSURFACE__
#endif