diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 22:01:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 22:01:16 +0400 |
commit | 2019f636b059fde75f459e646c8b0253a5c8189d (patch) | |
tree | 1c097f5a4b03f2fd8e1d379f3ec1beb3b91c88e9 /intern/cycles | |
parent | 391a214303ed7d7307b8c26496d00607a1b34814 (diff) |
misc small changes and bmesh support for testing script
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/enums.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/enums.py b/intern/cycles/blender/addon/enums.py index da4c73a5d3b..e1b138def3c 100644 --- a/intern/cycles/blender/addon/enums.py +++ b/intern/cycles/blender/addon/enums.py @@ -21,8 +21,8 @@ from . import engine devices = ( - ("CPU", "CPU", "Use CPU for rendering"), - ("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences")) + ("CPU", "CPU", "Use CPU for rendering"), + ("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences")) feature_set = ( ("SUPPORTED", "Supported", "Only use finished and supported features"), diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index d3c06084ad3..70f38fa7e8c 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -149,6 +149,7 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel): sub.prop(cscene, "debug_use_spatial_splits") sub.prop(cscene, "use_cache") + class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): bl_label = "Layers" bl_options = {'DEFAULT_CLOSED'} @@ -708,7 +709,7 @@ def draw_device(self, context): scene = context.scene layout = self.layout - if scene.render.engine == "CYCLES": + if scene.render.engine == 'CYCLES': cscene = scene.cycles layout.prop(cscene, "feature_set") @@ -719,6 +720,7 @@ def draw_device(self, context): elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL': layout.prop(cscene, "device") + def draw_pause(self, context): layout = self.layout scene = context.scene @@ -726,7 +728,7 @@ def draw_pause(self, context): if scene.render.engine == "CYCLES": view = context.space_data - if view.viewport_shade == "RENDERED": + if view.viewport_shade == 'RENDERED': cscene = scene.cycles layout.prop(cscene, "preview_pause", icon="PAUSE", text="") |