From a3ce64be5a828cbf8896be18b9c1060d5520bce8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 1 Aug 2016 11:54:02 +1000 Subject: Cleanup: unused vars, imports, pep8 --- release/scripts/startup/bl_ui/properties_data_bone.py | 3 +-- .../startup/bl_ui/properties_grease_pencil_common.py | 15 +++++++-------- release/scripts/startup/bl_ui/space_dopesheet.py | 1 + release/scripts/startup/bl_ui/space_image.py | 3 +-- release/scripts/startup/bl_ui/space_view3d.py | 12 +++++------- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 1 + 6 files changed, 16 insertions(+), 19 deletions(-) (limited to 'release/scripts/startup/bl_ui') diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index 853d45e2396..3a5475514c9 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -153,7 +153,7 @@ class BONE_PT_curved(BoneButtonsPanel, Panel): def draw(self, context): ob = context.object bone = context.bone - arm = context.armature + # arm = context.armature pchan = None if ob and bone: @@ -268,7 +268,6 @@ class BONE_PT_relations(BoneButtonsPanel, Panel): sub.prop(bone, "use_local_location") - class BONE_PT_display(BoneButtonsPanel, Panel): bl_label = "Display" diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index ac412688fa1..baa70ed08f5 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -63,7 +63,7 @@ class GreasePencilDrawingToolsPanel: def draw(self, context): layout = self.layout - is_3d_view = context.space_data.type == 'VIEW_3D' + is_3d_view = context.space_data.type == 'VIEW_3D' is_clip_editor = context.space_data.type == 'CLIP_EDITOR' col = layout.column(align=True) @@ -136,7 +136,7 @@ class GreasePencilStrokeEditPanel: def draw(self, context): layout = self.layout - is_3d_view = context.space_data.type == 'VIEW_3D' + is_3d_view = context.space_data.type == 'VIEW_3D' if not is_3d_view: layout.label(text="Select:") @@ -214,13 +214,13 @@ class GreasePencilStrokeSculptPanel: layout.separator() - if settings.tool == 'THICKNESS': + if tool == 'THICKNESS': layout.row().prop(brush, "direction", expand=True) - elif settings.tool == 'PINCH': + elif tool == 'PINCH': row = layout.row(align=True) row.prop_enum(brush, "direction", 'ADD', text="Pinch") row.prop_enum(brush, "direction", 'SUBTRACT', text="Inflate") - elif settings.tool == 'TWIST': + elif tool == 'TWIST': row = layout.row(align=True) row.prop_enum(brush, "direction", 'SUBTRACT', text="CW") row.prop_enum(brush, "direction", 'ADD', text="CCW") @@ -228,7 +228,7 @@ class GreasePencilStrokeSculptPanel: layout.separator() layout.prop(settings, "use_select_mask") - if settings.tool == 'SMOOTH': + if tool == 'SMOOTH': layout.prop(brush, "affect_pressure") @@ -581,14 +581,13 @@ class GreasePencilDataPanel: col.active = not gpl.lock col.prop(gpl, "line_width", slider=True) - split = layout.split(percentage=0.5) split.active = not gpl.lock col = split.column(align=True) col.prop(gpl, "use_volumetric_strokes") col.prop(gpl, "show_points", text="Points") - + col = split.column(align=True) col.prop(gpl, "use_hq_fill") col.prop(gpl, "show_x_ray") diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index d6d91980201..4d365c8dc08 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -103,6 +103,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False): layout.prop(dopesheet, "use_datablock_sort", text="") + ####################################### # DopeSheet Editor - General/Standard UI diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index c191a4b5bdc..9f719bc793e 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -729,7 +729,6 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel): @classmethod def poll(cls, context): sima = context.space_data - toolsettings = context.tool_settings.image_paint return sima.show_paint @@ -987,7 +986,7 @@ class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel): layout = self.layout toolsettings = context.tool_settings - brush = toolsettings.image_paint.brush + # brush = toolsettings.image_paint.brush ups = toolsettings.unified_paint_settings diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index fdf0996ac1e..681fa8e39aa 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -37,7 +37,6 @@ class VIEW3D_HT_header(Header): row = layout.row(align=True) row.template_header() - sub = row.row(align=True) VIEW3D_MT_editor_menus.draw_collapsible(context, layout) @@ -137,13 +136,12 @@ class VIEW3D_HT_header(Header): row.operator("gpencil.copy", text="", icon='COPYDOWN') row.operator("gpencil.paste", text="", icon='PASTEDOWN') - layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH') # XXX: icon + # XXX: icon + layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH') layout.prop(context.tool_settings.gpencil_sculpt, "use_select_mask") - - class VIEW3D_MT_editor_menus(Menu): bl_space_type = 'VIEW3D_MT_editor_menus' bl_label = "" @@ -1505,14 +1503,14 @@ class VIEW3D_MT_object_apply(Menu): props.location, props.rotation, props.scale = False, True, True layout.separator() - + layout.operator("object.transforms_to_deltas", text="Location to Deltas", text_ctxt=i18n_contexts.default).mode = 'LOC' layout.operator("object.transforms_to_deltas", text="Rotation to Deltas", text_ctxt=i18n_contexts.default).mode = 'ROT' layout.operator("object.transforms_to_deltas", text="Scale to Deltas", text_ctxt=i18n_contexts.default).mode = 'SCALE' - + layout.operator("object.transforms_to_deltas", text="All Transforms to Deltas", text_ctxt=i18n_contexts.default).mode = 'ALL' layout.operator("object.anim_transforms_to_deltas") - + layout.separator() layout.operator("object.visual_transform_apply", text="Visual Transform", text_ctxt=i18n_contexts.default) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index e9f4d715ec2..e9f4a45c2c3 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -605,6 +605,7 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel): colsub = layout.column(align=True) colsub.prop(cps, "surface_plane", expand=True) + # ********** default tools for editmode_surface **************** class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel): -- cgit v1.2.3