[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45473] trunk/blender/release/scripts/ startup: code cleanup: remove unused imports/defines + other redundant code .

Campbell Barton ideasman42 at gmail.com
Sun Apr 8 15:11:26 CEST 2012


Revision: 45473
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45473
Author:   campbellbarton
Date:     2012-04-08 13:11:25 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
code cleanup: remove unused imports/defines + other redundant code.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    trunk/blender/release/scripts/startup/bl_operators/clip.py
    trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
    trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py

Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -24,7 +24,6 @@
 from bpy.props import (FloatProperty,
                        IntProperty,
                        BoolProperty,
-                       FloatVectorProperty,
                        )
 
 from bpy_extras import object_utils

Modified: trunk/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/clip.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_operators/clip.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -99,11 +99,11 @@
     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 @@
 
     @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)
 

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -194,8 +194,8 @@
         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()

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -796,7 +796,6 @@
         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")

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -18,7 +18,7 @@
 
 # <pep8 compliant>
 import bpy
-from bpy.types import Menu, OperatorProperties
+from bpy.types import Menu
 
 
 class USERPREF_MT_keyconfigs(Menu):

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-04-08 08:09:37 UTC (rev 45472)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-04-08 13:11:25 UTC (rev 45473)
@@ -1811,9 +1811,6 @@
     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 @@
     def draw(self, context):
         layout = self.layout
 
-    def draw(self, context):
-        layout = self.layout
-
         layout.operator("mesh.dissolve")
 
         layout.separator()




More information about the Bf-blender-cvs mailing list