[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50347] trunk/blender/intern/cycles/ blender/addon/ui.py: * Added back UI switch for the Cycles shading system.

[Thomas Dinges]

Revision: 50347
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50347
Author:   dingto
Date:     2012-09-03 12:35:32 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
* Added back UI switch for the Cycles shading system. Only visible when the feature set is "Experimental". 

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

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-09-03 12:01:00 UTC (rev 50346)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-09-03 12:35:32 UTC (rev 50347)
@@ -920,6 +920,9 @@
             layout.prop(cscene, "device")
         elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
             layout.prop(cscene, "device")
+            
+        if cscene.feature_set == 'EXPERIMENTAL' and cscene.device == 'CPU' and engine.with_osl():
+            layout.prop(cscene, "shading_system")
 
 
 def draw_pause(self, context):