[Bf-blender-cvs] [9b01e7bc27c] blender2.8: UI: move Cycles device to Performance panel.
Brecht Van Lommel
noreply at git.blender.org
Sun Jun 3 21:36:45 CEST 2018
Commit: 9b01e7bc27c4a8c8c9f95aa074f458f3e734d23b
Author: Brecht Van Lommel
Date: Sun Jun 3 16:34:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9b01e7bc27c4a8c8c9f95aa074f458f3e734d23b
UI: move Cycles device to Performance panel.
===================================================================
M intern/cycles/blender/addon/ui.py
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 8793ddb83f6..bd2d5437f8f 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -373,6 +373,18 @@ class CYCLES_RENDER_PT_performance(CyclesButtonsPanel, Panel):
col = layout.column()
+ col = layout.column()
+ col.active = show_device_active(context)
+ col.prop(cscene, "device")
+
+ from . import engine
+ if engine.with_osl() and use_cpu(context):
+ col.prop(cscene, "shading_system")
+
+ col.separator()
+
+ col = layout.column()
+
col.row(align=True).prop(rd, "threads_mode")
sub = col.column(align=True)
sub.enabled = rd.threads_mode == 'FIXED'
@@ -1460,13 +1472,6 @@ def draw_device(self, context):
col = layout.column()
col.prop(cscene, "feature_set")
- col = layout.column()
- col.active = show_device_active(context)
- col.prop(cscene, "device")
-
- if engine.with_osl() and use_cpu(context):
- layout.prop(cscene, "shading_system")
-
def draw_pause(self, context):
layout = self.layout
More information about the Bf-blender-cvs
mailing list