From 922d72355dc23698b87e3f16b062e9889d8ba942 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 1 Sep 2015 03:51:50 +1000 Subject: Cleanup: pep8 --- intern/cycles/blender/addon/engine.py | 1 + release/scripts/modules/bl_previews_utils/bl_previews_render.py | 2 +- release/scripts/modules/nodeitems_utils.py | 2 ++ release/scripts/modules/progress_report.py | 1 + release/scripts/startup/bl_operators/file.py | 1 + release/scripts/startup/bl_ui/properties_freestyle.py | 4 ---- release/scripts/startup/bl_ui/space_filebrowser.py | 4 ++-- release/scripts/startup/bl_ui/space_image.py | 2 +- release/scripts/startup/bl_ui/space_time.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index c936b900d75..2bfac3c6fa0 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -49,6 +49,7 @@ def _workaround_buggy_drivers(): print("Cycles: OpenGL driver known to be buggy, disabling OpenCL platform.") _cycles.opencl_disable() + def init(): import bpy import _cycles diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py index d53fc3ea8d1..27922c6c5c5 100644 --- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py +++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py @@ -41,7 +41,7 @@ def rna_backup_gen(data, include_props=None, exclude_props=None, root=()): # only writable properties... for p in data.bl_rna.properties: pid = p.identifier - if pid in {'rna_type',}: + if pid in {'rna_type', }: continue path = root + (pid,) if include_props is not None and path not in include_props: diff --git a/release/scripts/modules/nodeitems_utils.py b/release/scripts/modules/nodeitems_utils.py index 1cc9afc78cc..be6f031217c 100644 --- a/release/scripts/modules/nodeitems_utils.py +++ b/release/scripts/modules/nodeitems_utils.py @@ -85,6 +85,7 @@ class NodeItemCustom: _node_categories = {} + def register_node_categories(identifier, cat_list): if identifier in _node_categories: raise KeyError("Node categories list '%s' already registered" % identifier) @@ -167,6 +168,7 @@ def unregister_node_categories(identifier=None): unregister_node_cat_types(cat_types) _node_categories.clear() + def draw_node_categories_menu(self, context): for cats in _node_categories.values(): cats[1](self, context) diff --git a/release/scripts/modules/progress_report.py b/release/scripts/modules/progress_report.py index 0d1f4f2bef8..578eb967fec 100644 --- a/release/scripts/modules/progress_report.py +++ b/release/scripts/modules/progress_report.py @@ -20,6 +20,7 @@ import time + class ProgressReport: """ A basic 'progress report' using either simple prints in console, or WindowManager's 'progress' API. diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py index a6a6982e746..efcc7d5c65e 100644 --- a/release/scripts/startup/bl_operators/file.py +++ b/release/scripts/startup/bl_operators/file.py @@ -28,6 +28,7 @@ from bpy.props import ( # ########## Datablock previews... ########## + class WM_OT_previews_batch_generate(Operator): """Generate selected .blend file's previews""" bl_idname = "wm.previews_batch_generate" diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index f58a698d194..e0620447185 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -381,7 +381,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) - def draw_alpha_modifier(self, context, modifier): layout = self.layout @@ -496,7 +495,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, row.prop(modifier, "angle_min") row.prop(modifier, "angle_max") - elif modifier.type == 'CURVATURE_3D': self.draw_modifier_curve_common(box, modifier, False, False) row = box.row(align=True) @@ -510,7 +508,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) - def draw_geometry_modifier(self, context, modifier): layout = self.layout @@ -611,7 +608,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, elif modifier.type == 'SIMPLIFICATION': box.prop(modifier, "tolerance") - def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 0b9c8474dd9..ca695208a67 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -69,8 +69,8 @@ class FILEBROWSER_HT_header(Header): row.prop(params, "use_filter_folder", text="") if params.filter_glob: - #if st.active_operator and hasattr(st.active_operator, "filter_glob"): - # row.prop(params, "filter_glob", text="") + # if st.active_operator and hasattr(st.active_operator, "filter_glob"): + # row.prop(params, "filter_glob", text="") row.label(params.filter_glob) else: row.prop(params, "use_filter_blender", text="") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 53209a64848..c3024b25282 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -941,7 +941,7 @@ class IMAGE_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel): row = col.row(align=True) row.prop(ipaint, "tile_x", text="X", toggle=True) row.prop(ipaint, "tile_y", text="Y", toggle=True) - + class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel): bl_label = "Appearance" diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index c4c4097315c..817c28c6359 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -230,7 +230,7 @@ class TIME_MT_autokey(Menu): def marker_menu_generic(layout): - #layout.operator_context = 'EXEC_REGION_WIN' + # layout.operator_context = 'EXEC_REGION_WIN' layout.column() layout.operator("marker.add", "Add Marker") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b936e2df165..bb0ad001c34 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1998,7 +1998,7 @@ class VIEW3D_MT_pose_group(Menu): layout.separator() - #layout.operator_context = 'INVOKE_AREA' + # layout.operator_context = 'INVOKE_AREA' layout.operator("pose.group_unassign") layout.operator("pose.group_remove") @@ -3292,7 +3292,7 @@ class VIEW3D_PT_background_image(Panel): box.template_image(bg, "image", bg.image_user, compact=True) has_bg = True - if use_multiview and bg.view_axis in {'CAMERA','ALL'}: + if use_multiview and bg.view_axis in {'CAMERA', 'ALL'}: box.prop(bg.image, "use_multiview") column = box.column() diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 2294e109f0c..a24dc494c30 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1552,7 +1552,6 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): row.prop(sculpt, "lock_y", text="Y", toggle=True) row.prop(sculpt, "lock_z", text="Z", toggle=True) - layout.label(text="Tiling:") row = layout.row(align=True) @@ -1562,6 +1561,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): layout.column().prop(sculpt, "tile_offset", text="Tile Offset") + class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel): bl_category = "Options" bl_label = "Appearance" -- cgit v1.2.3