diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-19 20:38:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-19 20:40:10 +0400 |
commit | 1ea47c9af9bf707d7ddb36c88425636ac35e0fc8 (patch) | |
tree | 0439da09aa8ee0417a89240b45fa569ffa8899e0 /release | |
parent | 780459e40646e99b555fee7062ace7386dc845fd (diff) |
Code Cleanup: style, spelling and pep8 edits
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/addon_utils.py | 1 | ||||
-rw-r--r-- | release/scripts/modules/bpy/path.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/rna_info.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/anim.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/view3d.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_info.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 8 |
14 files changed, 23 insertions, 23 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 6f08f70458b..e76bcc02751 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -35,6 +35,7 @@ error_duplicates = False error_encoding = False addons_fake_modules = {} + def paths(): # RELEASE SCRIPTS: official scripts distributed in Blender releases addon_paths = _bpy.utils.script_paths("addons") diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index da1a52e560d..ccc9df93b0d 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -321,7 +321,7 @@ def reduce_dirs(dirs): """ dirs = list({_os.path.normpath(_os.path.abspath(d)) for d in dirs}) dirs.sort(key=lambda d: len(d)) - for i in range(len(dirs) -1, -1, -1): + for i in range(len(dirs) - 1, -1, -1): for j in range(i): print(i, j) if len(dirs[i]) == len(dirs[j]): diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 60b11884e30..3643ad89ea6 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -98,6 +98,7 @@ class InfoStructRNA: ) global_lookup = {} + def __init__(self, rna_type): self.bl_rna = rna_type diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 3c4b66514de..41f39b90464 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -281,4 +281,3 @@ class ClearUselessActions(Operator): self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions" % removed) return {'FINISHED'} - diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index bf51dc5672a..2ec095d2e7b 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -111,7 +111,6 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): return self.execute(context) - class VIEW3D_OT_edit_mesh_extrude_shrink_fatten(Operator): "Extrude and move along individual normals" bl_label = "Extrude and Move on Individual Normals" diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 5269d151bdc..2171ce67fd3 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -306,7 +306,7 @@ class DATA_PT_font(CurveButtonsPanel, Panel): row.template_ID(text, "font_bold_italic", open="font.open", unlink="font.unlink") #layout.prop(text, "font") - + row = layout.split(percentage=0.25) row.label(text="Body Text:") row.prop(text, "body", text="") diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index e8d0bec6524..f59d479c509 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -339,7 +339,7 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): col = row.column(align=True) col.operator("mesh.uv_texture_add", icon='ZOOMIN', text="") col.operator("mesh.uv_texture_remove", icon='ZOOMOUT', text="") - + if lay: layout.prop(lay, "name") @@ -362,7 +362,7 @@ class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): col = row.column(align=True) col.operator("mesh.vertex_color_add", icon='ZOOMIN', text="") col.operator("mesh.vertex_color_remove", icon='ZOOMOUT', text="") - + if lay: layout.prop(lay, "name") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 4d5d3e6936a..f8a37e2768f 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1218,27 +1218,27 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): row = col.row(align=True) row.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density") row.prop(psys, "invert_vertex_group_density", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_length", ob, "vertex_groups", text="Length") row.prop(psys, "invert_vertex_group_length", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") row.prop(psys, "invert_vertex_group_clump", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") row.prop(psys, "invert_vertex_group_kink", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") row.prop(psys, "invert_vertex_group_roughness_1", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") row.prop(psys, "invert_vertex_group_roughness_2", text="", toggle=True, icon='ARROW_LEFTRIGHT') - + row = col.row(align=True) row.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") row.prop(psys, "invert_vertex_group_roughness_end", text="", toggle=True, icon='ARROW_LEFTRIGHT') diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index cc2d1dc1e66..397b74116c2 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -727,7 +727,7 @@ class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel): tex_slot_mask = brush.mask_texture_slot col = layout.column() - + col.label(text="Curve:") row = col.row(align=True) diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 52592594748..a7a648e3c44 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -169,7 +169,6 @@ class INFO_MT_file_external_data(Menu): layout.operator("file.find_missing_files") - class INFO_MT_game(Menu): bl_label = "Game" diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 8d577bb22c5..46234b638eb 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -364,7 +364,7 @@ class NODE_PT_backdrop(Panel): col.prop(snode, "backdrop_x", text="X") col.prop(snode, "backdrop_y", text="Y") col.operator("node.backimage_move", text="Move") - + layout.operator("node.backimage_fit", text="Fit") diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 700d1004718..4cb67181fdb 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -228,9 +228,9 @@ def marker_menu_generic(layout): layout.operator("marker.rename", text="Rename Marker") layout.operator("marker.move", text="Grab/Move Marker") - + layout.separator() - + layout.operator("screen.marker_jump", text="Jump to Next Marker").next = True layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index ec9c7ae9ffc..c49fa6768fe 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -833,6 +833,7 @@ class VIEW3D_MT_select_paint_mask_vertex(Menu): # XXX: INFO_MT_ names used to keep backwards compatibility (Addons etc that hook into the menu) + class INFO_MT_mesh_add(Menu): bl_idname = "INFO_MT_mesh_add" bl_label = "Mesh" @@ -1597,7 +1598,7 @@ class VIEW3D_MT_hide_mask(Menu): props = layout.operator("paint.mask_flood_fill", text="Clear Mask") props.mode = 'VALUE' props.value = 0 - + props = layout.operator("view3d.select_border", text="Box Mask") props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask") @@ -2799,7 +2800,7 @@ class VIEW3D_PT_view3d_shading(Panel): if not scene.render.use_shading_nodes: col.prop(gs, "material_mode", text="") col.prop(view, "show_textured_solid") - + if view.viewport_shade == 'SOLID': col.prop(view, "use_matcap") if view.use_matcap: diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 8c86cc6c8a5..cd3c238fe86 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -740,6 +740,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col.prop(brush, "vertex_tool", text="Blend") + class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel): bl_label = "Overlay" bl_options = {'DEFAULT_CLOSED'} @@ -753,8 +754,7 @@ class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel): context.vertex_paint_object or context.weight_paint_object or context.image_paint_object)) - - + def draw(self, context): layout = self.layout @@ -764,7 +764,7 @@ class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel): tex_slot_mask = brush.mask_texture_slot col = layout.column() - + col.label(text="Curve:") row = col.row(align=True) @@ -778,7 +778,7 @@ class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel): sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') col.active = brush.brush_capabilities.has_overlay - + if context.image_paint_object or context.sculpt_object or context.vertex_paint_object: col.label(text="Texture:") row = col.row(align=True) |