[Bf-blender-cvs] [2069606] master: Code cleanup: UI cleanup for cycles UI code and fix typo in system info.

[Thomas Dinges]

Commit: 2069606dc51d84b6db96eee5b82cdcb385079f01
Author: Thomas Dinges
Date:   Sun Dec 8 12:13:09 2013 +0100
http://developer.blender.org/rB2069606dc51d84b6db96eee5b82cdcb385079f01

Code cleanup: UI cleanup for cycles UI code and fix typo in system info.

===================================================================

M	intern/cycles/blender/addon/ui.py
M	release/scripts/modules/sys_info.py

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 42d5e01..56b6dde 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1250,11 +1250,7 @@ def draw_device(self, context):
         layout.prop(cscene, "feature_set")
 
         device_type = context.user_preferences.system.compute_device_type
-        if device_type == 'CUDA':
-            layout.prop(cscene, "device")
-        elif device_type == 'OPENCL':
-            layout.prop(cscene, "device")
-        elif device_type == 'NETWORK':
+        if device_type in ('CUDA', 'OPENCL', 'NETWORK'):
             layout.prop(cscene, "device")
 
         if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'):
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index ef3e562..1785ab5 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -138,7 +138,7 @@ def write_sysinfo(op):
     else:
         output.write("Blender was built without OpenImageIO support\n")
 
-    output.write("OpenShadingLanguuage: ")
+    output.write("OpenShadingLanguage: ")
     if bpy.app.build_options.cycles:
         if bpy.app.build_options.cycles_osl:
             from _cycles import osl_version_string