diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-07 05:38:03 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-07 05:38:03 +0400 |
commit | 63d523336f3876f6dca5affd66a190df88a87747 (patch) | |
tree | b4fb4677fe1138ae0476526d442a52b0804fa30b /release | |
parent | 6774e727a28186258b6bfa443da0ef7aec280be3 (diff) |
freestyle lineset `tag` attribute was defined but not used, also some code cleanup.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 5 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/mesh_utils.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/object.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 5 |
11 files changed, 25 insertions, 20 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 9c4117f0953..b78105dedb5 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -654,8 +654,9 @@ def make_rna_paths(struct_name, prop_name, enum_name): :type prop_name: string :arg enum_name: Name of a RNA enum identifier. :type enum_name: string - :return: A triple of three "RNA paths" (most_complete_path, "struct.prop", "struct.prop:'enum'"). - If no enum_name is given, the third element will always be void. + :return: A triple of three "RNA paths" + (most_complete_path, "struct.prop", "struct.prop:'enum'"). + If no enum_name is given, the third element will always be void. :rtype: tuple of strings """ src = src_rna = src_enum = "" diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py index f4fdfece947..d905964e71c 100644 --- a/release/scripts/modules/bpy_extras/mesh_utils.py +++ b/release/scripts/modules/bpy_extras/mesh_utils.py @@ -328,10 +328,12 @@ def ngon_tessellate(from_data, indices, fix_loops=True): fgon to create from existing verts. from_data: either a mesh, or a list/tuple of vectors. - :arg indices: a list of indices to use this list is the ordered closed polyline + :arg indices: a list of indices to use this list + is the ordered closed polyline to fill, and can be a subset of the data given. :type indices: list - :arg fix_loops: If this is enabled polylines that use loops to make multiple + :arg fix_loops: If this is enabled polylines + that use loops to make multiple polylines are delt with correctly. :type fix_loops: bool """ diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index ab5dc3e6aee..786b7b5460e 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -191,7 +191,8 @@ class AddObjectHelper: def object_add_grid_scale(context): """ - Return scale which should be applied on object data to align it to grid scale + Return scale which should be applied on object + data to align it to grid scale """ space_data = context.space_data diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index ae6b80865dd..b57594d14f9 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -473,7 +473,8 @@ class ShapeTransfer(Operator): class JoinUVs(Operator): - """Transfer UV Layouts from active to selected objects (needs matching geometry)""" + """Transfer UV Layouts from active to selected objects """ \ + """(needs matching geometry)""" bl_idname = "object.join_uvs" bl_label = "Transfer UV Layouts" diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 523c58bfac3..f3434525b82 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -93,7 +93,7 @@ class RENDERLAYER_UL_linesets(UIList): layout.label("", icon_value=icon) ##ifdef WITH_FREESTYLE -# else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer) || +# else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer) || # RNA_struct_is_a(itemptr->type, &RNA_FreestyleLineSet)) { ##else # else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer)) { diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 7c32e72b3e3..ff8cf6ee197 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -222,9 +222,9 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col = split.column() col.prop(obj, "show_name", text="Name") col.prop(obj, "show_axis", text="Axis") - + obj_type = obj.type - + if obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}: # Makes no sense for cameras, armtures, etc.! col.prop(obj, "show_wire", text="Wire") diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index b130a8a275d..f2566b2f2f5 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -82,7 +82,7 @@ def brush_texture_settings(layout, brush, sculpt): else: layout.row().prop(tex_slot, "tex_paint_map_mode", text="") layout.separator() - + if tex_slot.map_mode == 'STENCIL': layout.operator("brush.stencil_fit_image_aspect") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 3537ca62d93..48af461a82e 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -786,7 +786,7 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel): col = layout.column() col.label(text="Stroke Method:") - + col.prop(brush, "stroke_method", text="") if brush.use_anchor: @@ -804,7 +804,6 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel): row.prop(brush, "spacing", text="Spacing") row.prop(brush, "use_pressure_spacing", toggle=True, text="") - col = layout.column() col.separator() diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index ac76b988e05..8a115c0df0d 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -151,7 +151,7 @@ class NODE_MT_select(Menu): layout.operator("node.select_all", text="Inverse").action = 'INVERT' layout.operator("node.select_linked_from") layout.operator("node.select_linked_to") - + layout.separator() layout.operator("node.select_same_type") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index be601d0b6a1..c36297a197c 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1641,12 +1641,12 @@ class VIEW3D_MT_pose_specials(Menu): def draw(self, context): layout = self.layout - - layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type="AUTOMATIC" - layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type="ENVELOPES" - + + layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type = 'AUTOMATIC' + layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type = 'ENVELOPES' + layout.separator() - + layout.operator("pose.select_constraint_target") layout.operator("pose.flip_names") layout.operator("pose.paths_calculate") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index ff368a682e9..30212096305 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -707,7 +707,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): self.prop_unified_strength(row, context, brush, "use_pressure_strength") row = col.row(align=True) - + col.prop(brush, "vertex_tool", text="Blend") # Vertex Paint Mode # @@ -815,7 +815,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): col = layout.column() col.label(text="Stroke Method:") - + if context.sculpt_object: col.prop(brush, "sculpt_stroke_method", text="") else: @@ -880,6 +880,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True) sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True) + class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel): bl_label = "Curve" bl_options = {'DEFAULT_CLOSED'} |