diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-17 10:17:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-17 10:26:01 +0300 |
commit | 847ec075eb52664a9943b35dda6eb80acfc4f1cf (patch) | |
tree | eac558379fe7907804d13438f9712014f9d0090e /intern | |
parent | 02cbc3c1e0be505724eb79f15d75adf6089063fe (diff) |
Cleanup: pep8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 6 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 9c78e0c9a62..0783c1c4cba 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -30,8 +30,10 @@ bl_info = { import bpy -from . import engine -from . import version_update +from . import ( + engine, + version_update, + ) class CyclesRender(bpy.types.RenderEngine): diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 545d0b6c26c..430c0a964b1 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -18,7 +18,11 @@ import bpy -from bpy.types import Panel, Menu, Operator, UIList +from bpy.types import ( + Panel, + Menu, + Operator, + ) class CYCLES_MT_sampling_presets(Menu): @@ -55,6 +59,7 @@ def use_cpu(context): return (device_type == 'NONE' or cscene.device == 'CPU') + def use_branched_path(context): cscene = context.scene.cycles device_type = context.user_preferences.system.compute_device_type @@ -442,7 +447,6 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel): rd = scene.render rv = rd.views.active - layout.active = rd.use_multiview basic_stereo = (rd.views_format == 'STEREO_3D') @@ -518,12 +522,12 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel): sub = col.column(align=True) sub.label("Viewport:") subhq = sub.column() - subhq.active = hq_support; + subhq.active = hq_support subhq.prop(dof_options, "use_high_quality") sub.prop(dof_options, "fstop") if dof_options.use_high_quality and hq_support: sub.prop(dof_options, "blades") - + col = split.column() col.label("Aperture:") |