diff options
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 19ab9053e9a..4423f3c266b 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1588,6 +1588,7 @@ class CyclesScene_PT_simplify(CyclesButtonsPanel, Panel): row.prop(rd, "simplify_subdivision", text="Viewport") row.prop(rd, "simplify_subdivision_render", text="Render") + col = layout.column(align=True) col.label(text="Child Particles") row = col.row(align=True) @@ -1650,10 +1651,11 @@ def draw_pause(self, context): if scene.render.engine == "CYCLES": view = context.space_data + cscene = scene.cycles + layout.prop(cscene, "preview_pause", icon="PAUSE", text="") + if view.viewport_shade == 'RENDERED': - cscene = scene.cycles layername = scene.render.layers.active.name - layout.prop(cscene, "preview_pause", icon="PAUSE", text="") layout.prop(cscene, "preview_active_layer", icon="RENDERLAYERS", text=layername) |