[Bf-blender-cvs] [c6c0628] master: Cycles: Remove requirement of using experimental kernel for hair and blur on AMD

[Sergey Sharybin]

Commit: c6c06285a7a248621134120a8a64b31d8b5f4f5d
Author: Sergey Sharybin
Date:   Sun Jun 7 18:22:48 2015 +0200
Branches: master
https://developer.blender.org/rBc6c06285a7a248621134120a8a64b31d8b5f4f5d

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.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index aec4fd9..1ef0762 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