* Added back UI switch for the Cycles shading system. Only visible when the feature...
authorThomas Dinges <blender@dingto.org>
Mon, 3 Sep 2012 12:35:32 +0000 (12:35 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 3 Sep 2012 12:35:32 +0000 (12:35 +0000)
intern/cycles/blender/addon/ui.py

index 5234db5255ef5327d4dcd3cc47bc593f5d24d0db..c30581ecd40cb8b549a36c39fbc1a55a20e6c536 100644 (file)
@@ -920,6 +920,9 @@ def draw_device(self, context):
             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):