[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2116] trunk/py/scripts/addons: cleanup

Campbell Barton ideasman42 at gmail.com
Mon Jul 11 00:57:28 CEST 2011


Revision: 2116
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2116
Author:   campbellbarton
Date:     2011-07-10 22:57:27 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
cleanup
- remove/comment unused variables
- remove unused imports
- fixed some bugs using incorrect variables

Modified Paths:
--------------
    trunk/py/scripts/addons/add_mesh_BoltFactory/Boltfactory.py
    trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py
    trunk/py/scripts/addons/add_mesh_BoltFactory/preset_utils.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_twisted_torus.py
    trunk/py/scripts/addons/io_anim_bvh/export_bvh.py
    trunk/py/scripts/addons/io_anim_bvh/import_bvh.py
    trunk/py/scripts/addons/io_coat3D/coat.py
    trunk/py/scripts/addons/io_coat3D/tex.py
    trunk/py/scripts/addons/io_convert_image_to_mesh_img/import_img.py
    trunk/py/scripts/addons/io_curve_svg/__init__.py
    trunk/py/scripts/addons/io_curve_svg/import_svg.py
    trunk/py/scripts/addons/io_mesh_ply/import_ply.py
    trunk/py/scripts/addons/io_mesh_raw/import_raw.py
    trunk/py/scripts/addons/io_scene_3ds/export_3ds.py
    trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
    trunk/py/scripts/addons/io_scene_fbx/__init__.py
    trunk/py/scripts/addons/io_scene_fbx/export_fbx.py
    trunk/py/scripts/addons/io_scene_m3/__init__.py
    trunk/py/scripts/addons/io_scene_m3/import_m3.py
    trunk/py/scripts/addons/io_scene_map/__init__.py
    trunk/py/scripts/addons/io_scene_map/export_map.py
    trunk/py/scripts/addons/io_scene_obj/__init__.py
    trunk/py/scripts/addons/io_scene_obj/export_obj.py
    trunk/py/scripts/addons/io_scene_obj/import_obj.py
    trunk/py/scripts/addons/io_scene_x3d/__init__.py
    trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
    trunk/py/scripts/addons/io_scene_x3d/import_x3d.py
    trunk/py/scripts/addons/io_shape_mdd/export_mdd.py
    trunk/py/scripts/addons/io_shape_mdd/import_mdd.py
    trunk/py/scripts/addons/light_field_tools/__init__.py
    trunk/py/scripts/addons/light_field_tools/light_field_tools.py
    trunk/py/scripts/addons/modules/ui_utils.py
    trunk/py/scripts/addons/netrender/client.py
    trunk/py/scripts/addons/netrender/master.py
    trunk/py/scripts/addons/netrender/master_html.py
    trunk/py/scripts/addons/netrender/model.py
    trunk/py/scripts/addons/netrender/operators.py
    trunk/py/scripts/addons/netrender/repath.py
    trunk/py/scripts/addons/netrender/slave.py
    trunk/py/scripts/addons/netrender/thumbnail.py
    trunk/py/scripts/addons/netrender/ui.py
    trunk/py/scripts/addons/netrender/utils.py
    trunk/py/scripts/addons/netrender/versioning.py
    trunk/py/scripts/addons/object_fracture/fracture_ops.py
    trunk/py/scripts/addons/render_povray/render.py
    trunk/py/scripts/addons/render_povray/ui.py
    trunk/py/scripts/addons/rigify/__init__.py
    trunk/py/scripts/addons/rigify/generate.py
    trunk/py/scripts/addons/rigify/metarig_menu.py
    trunk/py/scripts/addons/rigify/rigs/basic/copy.py
    trunk/py/scripts/addons/rigify/rigs/basic/copy_chain.py
    trunk/py/scripts/addons/rigify/rigs/biped/arm/__init__.py
    trunk/py/scripts/addons/rigify/rigs/biped/arm/deform.py
    trunk/py/scripts/addons/rigify/rigs/biped/arm/fk.py
    trunk/py/scripts/addons/rigify/rigs/biped/arm/ik.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/deform.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/fk.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/ik.py
    trunk/py/scripts/addons/rigify/rigs/finger.py
    trunk/py/scripts/addons/rigify/rigs/misc/delta.py
    trunk/py/scripts/addons/rigify/rigs/neck_short.py
    trunk/py/scripts/addons/rigify/rigs/palm.py
    trunk/py/scripts/addons/rigify/rigs/spine.py
    trunk/py/scripts/addons/rigify/ui.py
    trunk/py/scripts/addons/rigify/utils.py
    trunk/py/scripts/addons/space_view3d_math_vis/__init__.py
    trunk/py/scripts/addons/space_view3d_math_vis/utils.py
    trunk/py/scripts/addons/system_blend_info.py
    trunk/py/scripts/addons/system_demo_mode/__init__.py

Modified: trunk/py/scripts/addons/add_mesh_BoltFactory/Boltfactory.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/Boltfactory.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/Boltfactory.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -227,7 +227,7 @@
         if self.bf_Model_Type == 'bf_Model_Bolt':
             col.prop(self, 'bf_Bit_Type')
             if self.bf_Bit_Type == 'bf_Bit_None':
-                DoNothing = 1;
+                pass
             elif self.bf_Bit_Type == 'bf_Bit_Allen':
                  col.prop(self, 'bf_Allen_Bit_Depth')
                  col.prop(self, 'bf_Allen_Bit_Flat_Distance')

Modified: trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -16,8 +16,6 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-
-import os  #remove this
 import bpy
 
 try: 
@@ -30,7 +28,6 @@
 
 
 from math import *
-from bpy.props import IntProperty, FloatProperty ,EnumProperty
 from itertools import * 
 
 NARROW_UI = 180
@@ -278,7 +275,7 @@
     Ret =[]
     Face = [1,2,0]
     TempFace = [0,0,0]
-    A = 0
+    # A = 0  # UNUSED
     B = 1
     C = 2
     if NUM < 3:
@@ -475,7 +472,7 @@
         verts.append([x,y,0])
     
         
-    FaceStart_Inside = len(verts)
+    # FaceStart_Inside = len(verts)  # UNUSED
     verts.append([0,FLAT_RADIUS,0]) #10
     verts.append([Flat_Half,FLAT_RADIUS,0]) #11
     verts.append([Flat_Half,Flat_Half,0])     #12
@@ -518,14 +515,7 @@
     verts = []
     faces = []
     Row = 0
-    BEVEL = HEIGHT * 0.01
-    #Dome_Rad =  HEAD_RADIUS * (1.0/1.75)
-    
-    Dome_Rad = HEAD_RADIUS * 1.12
-    RAD_Offset = HEAD_RADIUS * 0.96
-    OtherRad = HEAD_RADIUS * 0.16
-    OtherRad_X_Offset = HEAD_RADIUS * 0.84
-    OtherRad_Z_Offset = HEAD_RADIUS * 0.504
+
     XRad = HEAD_RADIUS * 1.976
     ZRad = HEAD_RADIUS * 1.768
     EndRad = HEAD_RADIUS * 0.284
@@ -579,7 +569,7 @@
     
     faces.extend(Build_Face_List_Quads(FaceStart,Row-1,DIV))
 
-    Global_Head_Height = HEIGHT ;
+    # Global_Head_Height = HEIGHT  # UNUSED
 
     
     return Move_Verts_Up_Z(sVerts,Start_Height),faces,HEIGHT
@@ -595,7 +585,7 @@
     verts = []
     faces = []
     Row = 0
-    BEVEL = HEIGHT * 0.01
+    # BEVEL = HEIGHT * 0.01  # UNUSED
     #Dome_Rad =  HEAD_RADIUS * (1.0/1.75)
     
     Dome_Rad =  HEAD_RADIUS * 1.12
@@ -662,10 +652,7 @@
     verts = []
     faces = []
     Row = 0
-    BEVEL = HEIGHT * 0.01
 
-
-
 #    HEAD_RADIUS = (HEIGHT/tan(radians(60))) + SHANK_RADIUS
     HEIGHT = tan(radians(60)) * (HEAD_RADIUS - SHANK_RADIUS)
     #print (RAD1)
@@ -987,7 +974,7 @@
     
     Ret_Row = 0;
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Height_Start = Height_Offset - PITCH
     Height_Step = float(PITCH)/float(DIV)
     Deg_Step = 360.0 /float(DIV)
@@ -1111,7 +1098,7 @@
     INNER_RADIUS = INNER_DIA/2
     OUTTER_RADIUS = OUTTER_DIA/2
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Deg_Step = 360.0 /float(DIV)
     Height_Step = float(PITCH)/float(DIV)
 
@@ -1245,7 +1232,7 @@
     INNER_RADIUS = INNER_DIA/2
     OUTTER_RADIUS = OUTTER_DIA/2
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Deg_Step = 360.0 /float(DIV)
     Height_Step = float(PITCH)/float(DIV)
 
@@ -1263,9 +1250,7 @@
     Height_Offset = Z_LOCATION
     
     Lowest_Z_Vert = 0;
-    FaceStart = len(verts)
-    
-    
+
     for j in range(Num):
         
         for i in range(DIV+1):
@@ -1317,7 +1302,7 @@
     INNER_RADIUS = INNER_DIA/2
     OUTTER_RADIUS = OUTTER_DIA/2
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Deg_Step = 360.0 /float(DIV)
     Height_Step = float(PITCH)/float(DIV)
 
@@ -1325,7 +1310,7 @@
     Root_Height = float(PITCH) * float(ROOT_PERCENT)/float(100)
     Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height))/2.0
        
-    Col = 0
+    # Col = 0  # UNUSED
     Row = 0
     
     Height_Offset = Z_LOCATION 
@@ -1336,7 +1321,7 @@
     
     Lowest_Z_Vert = 0;
     
-    FaceStart = len(verts)
+    # FaceStart = len(verts)  # UNUSED
     for j in range(4):
         
         for i in range(DIV+1):
@@ -1409,7 +1394,7 @@
     DIV = 36
     
     Total_Row = 0
-    Thread_Len = 0;
+    # Thread_Len = 0  # UNUSED
     
     Face_Start = len(verts)
     Offset = 0.0;
@@ -1612,7 +1597,7 @@
     
     FaceStart = len(verts)
 
-    Start_Height = 0 - 3
+    # Start_Height = 0 - 3  # UNUSED
     Height_Offset = Z_LOCATION
     Lowest_Z_Vert = 0
     
@@ -1660,14 +1645,14 @@
 
     INNER_HOLE = OUTSIDE_RADIUS - (OUTSIDE_RADIUS * (1.5/4.75))
     EDGE_THICKNESS = (OUTSIDE_RADIUS * (0.4/4.75))
-    RAD1 = (OUTSIDE_RADIUS * (0.5/4.75))
+    # RAD1 = (OUTSIDE_RADIUS * (0.5/4.75))  # UNUSED
     OVER_ALL_HEIGTH = (OUTSIDE_RADIUS * (2.0/4.75))
     PART_THICKNESS = OVER_ALL_HEIGTH - EDGE_THICKNESS
     PART_INNER_HOLE = (OUTSIDE_RADIUS * (2.5/4.75))
     
     FaceStart = len(verts)
 
-    Start_Height = 0 - 3
+    # Start_Height = 0 - 3  # UNUSED
     Height_Offset = Z_LOCATION
     Lowest_Z_Vert = 0
     
@@ -1720,7 +1705,7 @@
     Height_Offset = Height_Offset + PITCH  #Move the offset up so that the verts start at 
                                            #at the correct place  (Height_Start)
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Height_Start = Height_Offset - PITCH 
     Height_Step = float(PITCH)/float(DIV)
     Deg_Step = 360.0 /float(DIV)
@@ -1792,7 +1777,7 @@
     
     Ret_Row = 0;
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     #Height_End = Height_Offset - PITCH - PITCH - PITCH- PITCH - PITCH- PITCH
     Height_End = Height_Offset - PITCH 
     #Height_End = -2.1
@@ -1884,13 +1869,13 @@
     INNER_RADIUS = INNER_DIA/2
     OUTTER_RADIUS = OUTTER_DIA/2
     
-    Half_Pitch = float(PITCH)/2
+    # Half_Pitch = float(PITCH)/2  # UNUSED
     Deg_Step = 360.0 /float(DIV)
     Height_Step = float(PITCH)/float(DIV)
             
     Num = int(round((HEIGHT- PITCH)/PITCH))  # less one pitch for the start and end that is 1/2 pitch high    
     
-    Col = 0
+    # Col = 0  # UNUSED
     Row = 0
     
     
@@ -2165,19 +2150,19 @@
 
     verts = []
     faces = []
-    sMeshName =''
+    # sMeshName =''  # UNUSED
     sObjName =''
         
     if props.bf_Model_Type == 'bf_Model_Bolt':
         #print('Create Bolt')
         verts, faces = Bolt_Mesh(props, context)
-        sMeshName = 'Bolt'
+        # sMeshName = 'Bolt'  # UNUSED
         sObjName = 'Bolt'
     
     if props.bf_Model_Type == 'bf_Model_Nut':
         #print('Create Nut')
         verts, faces = Nut_Mesh(props, context)
-        sMeshName = 'Nut'
+        # sMeshName = 'Nut'  # UNUSED
         sObjName = 'Nut'
 
     
@@ -2188,8 +2173,6 @@
     obj = create_mesh_object(context, verts, [], faces,sObjName,
             props.edit, align_matrix)
 
-
-    #print("Created_Object")
-    return
+    return obj
     
 

Modified: trunk/py/scripts/addons/add_mesh_BoltFactory/preset_utils.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/preset_utils.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/preset_utils.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -16,11 +16,9 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+import os
 
-import bpy
-import os, sys
 
-
 def getPresets():
 
     scriptPath = os.path.dirname(__file__)

Modified: trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -26,8 +26,6 @@
 #                       new mesh (as used in from_pydata).
 # name ... Name of the new mesh (& object).
 def create_mesh_object(context, verts, edges, faces, name):
-    scene = context.scene
-    obj_act = scene.objects.active
 
     # Create new mesh
     mesh = bpy.data.meshes.new(name)

Modified: trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -66,7 +66,6 @@
 """
 
 import bpy
-import mathutils
 from math import *
 from bpy.props import *
 
@@ -75,9 +74,6 @@
 #                       new mesh (as used in from_pydata).
 # name ... Name of the new mesh (& object).
 def create_mesh_object(context, verts, edges, faces, name):
-    scene = context.scene
-    obj_act = scene.objects.active
-
     # Create new mesh
     mesh = bpy.data.meshes.new(name)
 
@@ -250,7 +246,7 @@
 def add_spoke(a, t, d, radius, De, base, s, w, l, gap=0, width=19):
     Rd = radius - De
     Rb = Rd - base
-    Rl = Rb
+    # Rl = Rb  # UNUSED
 
     verts = []
     edgefaces = []

Modified: trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py	2011-07-10 17:28:53 UTC (rev 2115)
+++ trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py	2011-07-10 22:57:27 UTC (rev 2116)
@@ -41,8 +41,6 @@
 #                       new mesh (as used in from_pydata).
 # name ... Name of the new mesh (& object).
 def create_mesh_object(context, verts, edges, faces, name):
-    scene = context.scene
-    obj_act = scene.objects.active
 
     # Create new mesh
     mesh = bpy.data.meshes.new(name)
@@ -213,7 +211,7 @@
     for index in range(segments):
         quat = Quaternion(z_axis, (index / segments) * PI_2)
 
-        angle = PI_2 * index / segments
+        # angle = PI_2 * index / segments  # UNUSED
 
         # Row for flat side
         verts_flat.append(len(verts))


@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list