[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57086] trunk/blender/intern/cycles: Cycles OpenCL: disable requirement of enabling Experimental, environment varibale

[Brecht Van Lommel]

Revision: 57086
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57086
Author:   blendix
Date:     2013-05-28 17:37:24 +0000 (Tue, 28 May 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-05-28 16:57:28 UTC (rev 57085)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-05-28 17:37:24 UTC (rev 57086)
@@ -1162,7 +1162,7 @@
         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'):

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-28 16:57:28 UTC (rev 57085)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-28 17:37:24 UTC (rev 57086)
@@ -82,9 +82,20 @@
 #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__