blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

UI: move Cycles device to Performance panel.

This commit is contained in:
Brecht Van Lommel 2018-06-03 16:34:55 +02:00
parent 81dbf08eb4
commit 9b01e7bc27
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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