[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51120] trunk/blender/intern/cycles/ blender/addon/ui.py: Cycles / OSL:

[Thomas Dinges]

Revision: 51120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51120
Author:   dingto
Date:     2012-10-06 17:11:53 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Cycles / OSL:
* OSL UI message did not show up when device type was GPU, but User Preferences were None. Also remove experimental check, more convenient for testing. 

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-10-06 16:52:52 UTC (rev 51119)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-10-06 17:11:53 UTC (rev 51120)
@@ -955,7 +955,7 @@
         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():
+        if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'None'):
             layout.prop(cscene, "shading_system")