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

[Thomas Dinges]

Revision: 52050
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52050
Author:   dingto
Date:     2012-11-09 22:01:37 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Cycles / OSL:
* UI fix for "shading_system" property, own fault from r51120

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51120

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-11-09 21:44:31 UTC (rev 52049)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-11-09 22:01:37 UTC (rev 52050)
@@ -957,7 +957,7 @@
         elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
             layout.prop(cscene, "device")
 
-        if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'None'):
+        if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'):
             layout.prop(cscene, "shading_system")