diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-12-08 15:13:09 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-12-08 15:13:09 +0400 |
| commit | 2069606dc51d84b6db96eee5b82cdcb385079f01 (patch) | |
| tree | 127d49bf63deacce5bf5b360378635d58e227374 | |
| parent | b6646c6a2a92d72b92a03c4ee8ad655ff4f86c5e (diff) | |
Code cleanup: UI cleanup for cycles UI code and fix typo in system info.
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 | ||||
| -rw-r--r-- | release/scripts/modules/sys_info.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 42d5e011b83..56b6dde81d3 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 ef3e56209f0..1785ab59a5f 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 |