From c6c06285a7a248621134120a8a64b31d8b5f4f5d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 7 Jun 2015 18:22:48 +0200 Subject: 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. --- intern/cycles/kernel/kernel_types.h | 8 +++----- 1 file 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 -- cgit v1.2.3