blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

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

This commit is contained in:
Thomas Dinges 2013-12-08 12:13:09 +01:00
parent b6646c6a2a
commit 2069606dc5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/blender/addon/ui.py
View File

@ -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'):

2
release/scripts/modules/sys_info.py
View File

@ -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