diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-08 17:11:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-08 17:11:25 +0400 |
commit | 01e55b6fc347adeaa80800f2386eb1fb1f10a5e3 (patch) | |
tree | cf467e11e3f39889670b3a454fe8ed720a2f04c4 /release | |
parent | 4fc6ef1cf57a48626cbfa7fd9cc09de9bec29f92 (diff) |
code cleanup: remove unused imports/defines + other redundant code.
Diffstat (limited to 'release')
6 files changed, 8 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py index 0cd781f550f..75a6cd73d64 100644 --- a/release/scripts/startup/bl_operators/add_mesh_torus.py +++ b/release/scripts/startup/bl_operators/add_mesh_torus.py @@ -24,7 +24,6 @@ import mathutils from bpy.props import (FloatProperty, IntProperty, BoolProperty, - FloatVectorProperty, ) from bpy_extras import object_utils diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index a049195fd89..ffa66274f12 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -99,11 +99,11 @@ def CLIP_default_settings_from_track(clip, track): pattern = track.pattern_max - track.pattern_min search = track.search_max - track.search_min - pattern[0] = pattern[0] * clip.size[0] - pattern[1] = pattern[1] * clip.size[1] + pattern[0] = pattern[0] * width + pattern[1] = pattern[1] * height - search[0] = search[0] * clip.size[0] - search[1] = search[1] * clip.size[1] + search[0] = search[0] * width + search[1] = search[1] * height settings.default_tracker = track.tracker settings.default_pyramid_levels = track.pyramid_levels @@ -709,7 +709,7 @@ class CLIP_OT_setup_tracking_scene(Operator): @staticmethod def _createMesh(scene, name, vertices, faces): - from bpy_extras.io_utils import unpack_list, unpack_face_list + from bpy_extras.io_utils import unpack_list mesh = bpy.data.meshes.new(name=name) diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 7a1d830fd91..b8a37e38a17 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -194,8 +194,8 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): layout.active = curve.use_path col = layout.column() - layout.prop(curve, "path_duration", text="Frames") - layout.prop(curve, "eval_time") + col.prop(curve, "path_duration", text="Frames") + col.prop(curve, "eval_time") # these are for paths only row = layout.row() diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index ce6c7ad4e92..bfa2b4f60ef 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -796,7 +796,6 @@ class ConstraintButtonsPanel(): layout.operator("clip.constraint_to_fcurve") def OBJECT_SOLVER(self, context, layout, con): - scene = context.scene clip = self._getConstraintClip(context, con) layout.prop(con, "use_active_clip") diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py index 030e1ee0f6d..58697225811 100644 --- a/release/scripts/startup/bl_ui/space_userpref_keymap.py +++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py @@ -18,7 +18,7 @@ # <pep8 compliant> import bpy -from bpy.types import Menu, OperatorProperties +from bpy.types import Menu class USERPREF_MT_keyconfigs(Menu): diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 713ce26a71f..6b09f74ec4a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1811,9 +1811,6 @@ class VIEW3D_MT_edit_mesh_delete(Menu): def draw(self, context): layout = self.layout - def draw(self, context): - layout = self.layout - layout.operator_enum("mesh.delete", "type") layout.separator() @@ -1829,9 +1826,6 @@ class VIEW3D_MT_edit_mesh_dissolve(Menu): def draw(self, context): layout = self.layout - def draw(self, context): - layout = self.layout - layout.operator("mesh.dissolve") layout.separator() |