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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-11-21 20:31:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-21 21:00:29 +0300
commitf547bf2f1013a86dc5a6646707256a174c2a1b47 (patch)
treefc04536a4cfb2398a355d333e0b16186805268ca /intern/cycles/kernel/kernel_types.h
parentc08727ebabae1d84c9d4e3096a61ef131177d4d5 (diff)
Cycles: Make requested features struct aware of subsurface BSDF
This way we'll be able to disable SSS for the scene-adaptive kernel.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
-rw-r--r--intern/cycles/kernel/kernel_types.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 75a9e213d4f..31ad4940152 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -180,7 +180,7 @@ CCL_NAMESPACE_BEGIN
# define __KERNEL_DEBUG__
#endif
-/* Scene-based selective featrues compilation/ */
+/* Scene-based selective featrues compilation. */
#ifdef __NO_CAMERA_MOTION__
# undef __CAMERA_MOTION__
#endif
@@ -190,6 +190,9 @@ CCL_NAMESPACE_BEGIN
#ifdef __NO_HAIR__
# undef __HAIR__
#endif
+#ifdef __NO_SUBSURFACE__
+# undef __SUBSURFACE__
+#endif
/* Random Numbers */