Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-12-08 15:13:09 +0400
committerThomas Dinges <blender@dingto.org>2013-12-08 15:13:09 +0400
commit2069606dc51d84b6db96eee5b82cdcb385079f01 (patch)
tree127d49bf63deacce5bf5b360378635d58e227374 /intern
parentb6646c6a2a92d72b92a03c4ee8ad655ff4f86c5e (diff)
Code cleanup: UI cleanup for cycles UI code and fix typo in system info.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py6
1 files changed, 1 insertions, 5 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'):