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-06-07 19:22:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-08 12:15:39 +0300
commitc6c06285a7a248621134120a8a64b31d8b5f4f5d (patch)
tree35940ce269cb338b3d6ba27e963755710bbc6c98
parent27ed75271c1948abe5a420d881686406bf8e0ce8 (diff)
Cycles: Remove requirement of using experimental kernel for hair and blur on AMD
Those features are not selectively compiled, so there's no real benefit of hiding them under the experimental feature set.
-rw-r--r--intern/cycles/kernel/kernel_types.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index aec4fd9b325..1ef07629a3e 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -116,11 +116,9 @@ CCL_NAMESPACE_BEGIN
# define __BACKGROUND_MIS__
# define __LAMP_MIS__
# define __AO__
-# ifdef __KERNEL_EXPERIMENTAL__
-# define __CAMERA_MOTION__
-# define __OBJECT_MOTION__
-# define __HAIR__
-# endif
+# define __CAMERA_MOTION__
+# define __OBJECT_MOTION__
+# define __HAIR__
//#define __TRANSPARENT_SHADOWS__
#endif