diff options
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 551a0f85623..1d54915dd35 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -67,9 +67,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True row = layout.row() - sub = row.row() - sub.active = (device_type == 'NONE' or cscene.device == 'CPU') - sub.prop(cscene, "progressive") + row.prop(cscene, "progressive") if not cscene.progressive: row.prop(cscene, "squared_samples") @@ -82,7 +80,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): sub.prop(cscene, "seed") sub.prop(cscene, "sample_clamp") - if cscene.progressive or (device_type != 'NONE' and cscene.device == 'GPU'): + if cscene.progressive: col = split.column() sub = col.column(align=True) sub.label(text="Samples:") @@ -656,7 +654,6 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): lamp = context.lamp clamp = lamp.cycles cscene = context.scene.cycles - device_type = context.user_preferences.system.compute_device_type layout.prop(lamp, "type", expand=True) @@ -675,7 +672,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): sub.prop(lamp, "size", text="Size X") sub.prop(lamp, "size_y", text="Size Y") - if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'): + if not cscene.progressive: col.prop(clamp, "samples") col = split.column() @@ -864,7 +861,6 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): world = context.world cworld = world.cycles cscene = context.scene.cycles - device_type = context.user_preferences.system.compute_device_type col = layout.column() @@ -872,7 +868,7 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): sub = col.row(align=True) sub.active = cworld.sample_as_light sub.prop(cworld, "sample_map_resolution") - if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'): + if not cscene.progressive: sub.prop(cworld, "samples") |