diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-28 21:37:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-28 21:37:24 +0400 |
| commit | 27b8ea476dd36d440493e6724210a8aefed03d49 (patch) | |
| tree | 2e8d1b96dd97373a97f3b225c91011077dee1d54 /intern | |
| parent | f4d3fdf288ad270044bdefa02add7ee1c0be772a (diff) | |
Cycles OpenCL: disable requirement of enabling Experimental, environment varibale
already adds an extra step. Also list all features for OpenCL AMD to make testing
easier.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index d33422050a0..9218e2ecf7b 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1162,7 +1162,7 @@ def draw_device(self, context): device_type = context.user_preferences.system.compute_device_type if device_type == 'CUDA': layout.prop(cscene, "device") - elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL': + elif device_type == 'OPENCL': layout.prop(cscene, "device") if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'): diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 96fb17282e5..85a4971e8bd 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -82,9 +82,20 @@ CCL_NAMESPACE_BEGIN #define __SVM__ #define __EMISSION__ #define __IMAGE_TEXTURES__ -#define __HOLDOUT__ #define __PROCEDURAL_TEXTURES__ #define __EXTRA_NODES__ +#define __HOLDOUT__ +#define __NORMAL_MAP__ +//#define __BACKGROUND_MIS__ +//#define __LAMP_MIS__ +//#define __AO__ +//#define __ANISOTROPIC__ +//#define __CAMERA_MOTION__ +//#define __OBJECT_MOTION__ +//#define __HAIR__ +//#define __MULTI_CLOSURE__ +//#define __TRANSPARENT_SHADOWS__ +//#define __PASSES__ #endif #ifdef __KERNEL_OPENCL_INTEL_CPU__ |