diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-11 02:57:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-11 02:57:27 +0400 |
commit | 488e1da935d55330be55eb30b4605b993dd65dbd (patch) | |
tree | d4437d5e74e962482a4a6aa5336212c257f0245e /rigify | |
parent | 8012053e1e178c8cabb133e05dc1e36d52908fa7 (diff) |
cleanup
- remove/comment unused variables
- remove unused imports
- fixed some bugs using incorrect variables
Diffstat (limited to 'rigify')
-rw-r--r-- | rigify/__init__.py | 1 | ||||
-rw-r--r-- | rigify/generate.py | 6 | ||||
-rw-r--r-- | rigify/metarig_menu.py | 2 | ||||
-rw-r--r-- | rigify/rigs/basic/copy.py | 6 | ||||
-rw-r--r-- | rigify/rigs/basic/copy_chain.py | 2 | ||||
-rw-r--r-- | rigify/rigs/biped/arm/__init__.py | 1 | ||||
-rw-r--r-- | rigify/rigs/biped/arm/deform.py | 6 | ||||
-rw-r--r-- | rigify/rigs/biped/arm/fk.py | 7 | ||||
-rw-r--r-- | rigify/rigs/biped/arm/ik.py | 3 | ||||
-rw-r--r-- | rigify/rigs/biped/leg/__init__.py | 1 | ||||
-rw-r--r-- | rigify/rigs/biped/leg/deform.py | 6 | ||||
-rw-r--r-- | rigify/rigs/biped/leg/fk.py | 7 | ||||
-rw-r--r-- | rigify/rigs/biped/leg/ik.py | 3 | ||||
-rw-r--r-- | rigify/rigs/finger.py | 3 | ||||
-rw-r--r-- | rigify/rigs/misc/delta.py | 2 | ||||
-rw-r--r-- | rigify/rigs/neck_short.py | 9 | ||||
-rw-r--r-- | rigify/rigs/palm.py | 4 | ||||
-rw-r--r-- | rigify/rigs/spine.py | 2 | ||||
-rw-r--r-- | rigify/ui.py | 8 | ||||
-rw-r--r-- | rigify/utils.py | 3 |
20 files changed, 34 insertions, 48 deletions
diff --git a/rigify/__init__.py b/rigify/__init__.py index 1de834aa..c7b02d6c 100644 --- a/rigify/__init__.py +++ b/rigify/__init__.py @@ -41,7 +41,6 @@ else: from . import generate, ui, utils, metarig_menu import bpy -import bpy_types import os diff --git a/rigify/generate.py b/rigify/generate.py index 153162bc..0d2e2443 100644 --- a/rigify/generate.py +++ b/rigify/generate.py @@ -60,7 +60,7 @@ def generate_rig(context, metarig): rig_id = random_id(16) # Initial configuration - mode_orig = context.mode + # mode_orig = context.mode # UNUSED rest_backup = metarig.data.pose_position metarig.data.pose_position = 'REST' @@ -350,7 +350,7 @@ def generate_rig(context, metarig): # Ensure the collection of layer names exists for i in range(1 + len(metarig.data.rigify_layers), 29): - layer = metarig.data.rigify_layers.add() + metarig.data.rigify_layers.add() # Create list of layer name/row pairs layer_layout = [] @@ -401,7 +401,7 @@ def get_bone_rigs(obj, bone_name, halt_on_missing=False): try: rig = get_rig_type(rig_type).Rig(obj, bone_name, params) except ImportError: - message = "Rig Type Missing: python module for type '%s' not found (bone: %s)" % (t, bone_name) + message = "Rig Type Missing: python module for type '%s' not found (bone: %s)" % (rig_type, bone_name) if halt_on_missing: raise MetarigError(message) else: diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py index 56b82370..fefb4bd6 100644 --- a/rigify/metarig_menu.py +++ b/rigify/metarig_menu.py @@ -17,9 +17,7 @@ # ##### END GPL LICENSE BLOCK ##### import bpy -import mathutils from rigify.metarigs import human -from math import cos, sin, pi class AddHuman(bpy.types.Operator): diff --git a/rigify/rigs/basic/copy.py b/rigify/rigs/basic/copy.py index 22beedf1..d430113b 100644 --- a/rigify/rigs/basic/copy.py +++ b/rigify/rigs/basic/copy.py @@ -17,7 +17,6 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -from rigify.utils import MetarigError from rigify.utils import copy_bone from rigify.utils import strip_org, make_deformer_name from rigify.utils import create_bone_widget @@ -57,8 +56,9 @@ class Rig: # Get edit bones eb = self.obj.data.edit_bones - if self.make_control: - bone_e = eb[bone] + # UNUSED + # if self.make_control: + # bone_e = eb[bone] if self.make_deform: def_bone_e = eb[def_bone] diff --git a/rigify/rigs/basic/copy_chain.py b/rigify/rigs/basic/copy_chain.py index 4910ef82..b1dbcd83 100644 --- a/rigify/rigs/basic/copy_chain.py +++ b/rigify/rigs/basic/copy_chain.py @@ -40,7 +40,7 @@ class Rig: self.make_deforms = params.make_deforms if len(self.org_bones) <= 1: - raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone))) + raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name))) def generate(self): """ Generate the rig. diff --git a/rigify/rigs/biped/arm/__init__.py b/rigify/rigs/biped/arm/__init__.py index 93e757f4..74677af0 100644 --- a/rigify/rigs/biped/arm/__init__.py +++ b/rigify/rigs/biped/arm/__init__.py @@ -19,7 +19,6 @@ import bpy import imp from . import fk, ik, deform -from rigify.utils import MetarigError, get_layers imp.reload(fk) imp.reload(ik) diff --git a/rigify/rigs/biped/arm/deform.py b/rigify/rigs/biped/arm/deform.py index 2a7b3109..0e671359 100644 --- a/rigify/rigs/biped/arm/deform.py +++ b/rigify/rigs/biped/arm/deform.py @@ -17,10 +17,10 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -from math import acos, degrees +from math import acos from mathutils import Vector, Matrix from rigify.utils import MetarigError -from rigify.utils import copy_bone, flip_bone, put_bone +from rigify.utils import copy_bone, put_bone from rigify.utils import connected_children_names from rigify.utils import strip_org, make_mechanism_name, make_deformer_name @@ -197,7 +197,7 @@ class Rig: uarm1_p = pb[uarm1] if self.use_forearm_twist: farm2_p = pb[farm2] - hand_p = pb[hand] + # hand_p = pb[hand] # UNUSED # Upper arm constraints if self.use_upper_arm_twist: diff --git a/rigify/rigs/biped/arm/fk.py b/rigify/rigs/biped/arm/fk.py index 2c634b86..214d7682 100644 --- a/rigify/rigs/biped/arm/fk.py +++ b/rigify/rigs/biped/arm/fk.py @@ -17,11 +17,10 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -import math from rigify.utils import MetarigError -from rigify.utils import copy_bone, flip_bone, put_bone +from rigify.utils import copy_bone from rigify.utils import connected_children_names -from rigify.utils import strip_org, make_mechanism_name, make_deformer_name +from rigify.utils import strip_org, make_mechanism_name from rigify.utils import get_layers from rigify.utils import create_widget, create_limb_widget from rna_prop_ui import rna_idprop_ui_prop_get @@ -124,7 +123,7 @@ class Rig: hinge_p = pb[hinge] if self.org_parent != None: - socket1_p = pb[socket1] + # socket1_p = pb[socket1] # UNUSED socket2_p = pb[socket2] # Set the elbow to only bend on the x-axis. diff --git a/rigify/rigs/biped/arm/ik.py b/rigify/rigs/biped/arm/ik.py index 0ecf70e7..fb784b7d 100644 --- a/rigify/rigs/biped/arm/ik.py +++ b/rigify/rigs/biped/arm/ik.py @@ -23,7 +23,6 @@ from rigify.utils import MetarigError from rigify.utils import copy_bone from rigify.utils import connected_children_names from rigify.utils import strip_org, make_mechanism_name, insert_before_lr -from rigify.utils import get_layers from rigify.utils import create_widget, create_line_widget, create_sphere_widget from rna_prop_ui import rna_idprop_ui_prop_get @@ -169,7 +168,7 @@ class Rig: bpy.ops.object.mode_set(mode='OBJECT') pb = self.obj.pose.bones - uarm_p = pb[uarm] + # uarm_p = pb[uarm] # UNUSED farm_p = pb[farm] hand_p = pb[hand] pole_p = pb[pole] diff --git a/rigify/rigs/biped/leg/__init__.py b/rigify/rigs/biped/leg/__init__.py index 8f9286c7..21c5fa2b 100644 --- a/rigify/rigs/biped/leg/__init__.py +++ b/rigify/rigs/biped/leg/__init__.py @@ -19,7 +19,6 @@ import bpy import imp from . import fk, ik, deform -from rigify.utils import MetarigError, get_layers imp.reload(fk) imp.reload(ik) diff --git a/rigify/rigs/biped/leg/deform.py b/rigify/rigs/biped/leg/deform.py index bb6b6f39..d0f98e4a 100644 --- a/rigify/rigs/biped/leg/deform.py +++ b/rigify/rigs/biped/leg/deform.py @@ -17,10 +17,10 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -from math import acos, degrees +from math import acos from mathutils import Vector, Matrix from rigify.utils import MetarigError -from rigify.utils import copy_bone, flip_bone, put_bone +from rigify.utils import copy_bone, put_bone from rigify.utils import connected_children_names, has_connected_children from rigify.utils import strip_org, make_mechanism_name, make_deformer_name @@ -231,7 +231,7 @@ class Rig: thigh1_p = pb[thigh1] if self.use_shin_twist: shin2_p = pb[shin2] - foot_p = pb[foot] + # foot_p = pb[foot] # UNUSED # Thigh constraints if self.use_thigh_twist: diff --git a/rigify/rigs/biped/leg/fk.py b/rigify/rigs/biped/leg/fk.py index f2ce6653..0e51b501 100644 --- a/rigify/rigs/biped/leg/fk.py +++ b/rigify/rigs/biped/leg/fk.py @@ -17,12 +17,11 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -import math from mathutils import Vector from rigify.utils import MetarigError -from rigify.utils import copy_bone, flip_bone, put_bone +from rigify.utils import copy_bone from rigify.utils import connected_children_names, has_connected_children -from rigify.utils import strip_org, make_mechanism_name, make_deformer_name +from rigify.utils import strip_org, make_mechanism_name from rigify.utils import get_layers from rigify.utils import create_widget, create_limb_widget from rna_prop_ui import rna_idprop_ui_prop_get @@ -162,7 +161,7 @@ class Rig: hinge_p = pb[hinge] if self.org_parent != None: - socket1_p = pb[socket1] + # socket1_p = pb[socket1] # UNUSED socket2_p = pb[socket2] # Set the knee to only bend on the x-axis. diff --git a/rigify/rigs/biped/leg/ik.py b/rigify/rigs/biped/leg/ik.py index 54869b8e..806de417 100644 --- a/rigify/rigs/biped/leg/ik.py +++ b/rigify/rigs/biped/leg/ik.py @@ -23,7 +23,6 @@ from rigify.utils import MetarigError from rigify.utils import copy_bone, flip_bone, put_bone from rigify.utils import connected_children_names, has_connected_children from rigify.utils import strip_org, make_mechanism_name, insert_before_lr -from rigify.utils import get_layers from rigify.utils import create_widget, create_line_widget, create_sphere_widget, create_circle_widget from rna_prop_ui import rna_idprop_ui_prop_get @@ -322,7 +321,7 @@ class Rig: bpy.ops.object.mode_set(mode='OBJECT') pb = self.obj.pose.bones - thigh_p = pb[thigh] + # thigh_p = pb[thigh] # UNUSED shin_p = pb[shin] foot_p = pb[foot] pole_p = pb[pole] diff --git a/rigify/rigs/finger.py b/rigify/rigs/finger.py index 0bcea44b..c33fdfd9 100644 --- a/rigify/rigs/finger.py +++ b/rigify/rigs/finger.py @@ -22,8 +22,7 @@ from rigify.utils import MetarigError from rigify.utils import copy_bone from rigify.utils import connected_children_names from rigify.utils import strip_org, make_mechanism_name, make_deformer_name -from rigify.utils import get_layers -from rigify.utils import create_widget, create_line_widget, create_limb_widget +from rigify.utils import create_widget, create_limb_widget from rna_prop_ui import rna_idprop_ui_prop_get import re diff --git a/rigify/rigs/misc/delta.py b/rigify/rigs/misc/delta.py index dc8edd41..12bd69ce 100644 --- a/rigify/rigs/misc/delta.py +++ b/rigify/rigs/misc/delta.py @@ -59,7 +59,7 @@ class Rig: org_delta = self.org_bones["delta"] org_delta_e = eb[self.org_bones["delta"]] - org_child = self.org_bones["child"] + # org_child = self.org_bones["child"] # UNUSED org_child_e = eb[self.org_bones["child"]] # Calculate the matrix for achieving the delta diff --git a/rigify/rigs/neck_short.py b/rigify/rigs/neck_short.py index 58191e6a..b5ffc453 100644 --- a/rigify/rigs/neck_short.py +++ b/rigify/rigs/neck_short.py @@ -17,9 +17,8 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -from mathutils import Vector from rigify.utils import MetarigError -from rigify.utils import copy_bone, new_bone, flip_bone, put_bone +from rigify.utils import copy_bone, new_bone, put_bone from rigify.utils import connected_children_names from rigify.utils import strip_org, make_mechanism_name, make_deformer_name from rigify.utils import obj_to_bone, create_circle_widget @@ -54,7 +53,7 @@ class Rig: self.params = params if len(self.org_bones) <= 1: - raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone))) + raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name))) self.isolate = False if self.obj.data.bones[bone_name].parent: @@ -176,10 +175,10 @@ class Rig: pb = self.obj.pose.bones neck_ctrl_p = pb[neck_ctrl] neck_follow_p = pb[neck_follow] - neck_child_p = pb[neck_child] + # neck_child_p = pb[neck_child] # UNUSED head_ctrl_p = pb[head_ctrl] if self.isolate: - head_socket1_p = pb[head_socket1] + # head_socket1_p = pb[head_socket1] # UNUSED head_socket2_p = pb[head_socket2] # Custom bone appearance diff --git a/rigify/rigs/palm.py b/rigify/rigs/palm.py index d1a3cf61..6ad72f4e 100644 --- a/rigify/rigs/palm.py +++ b/rigify/rigs/palm.py @@ -17,10 +17,10 @@ #======================= END GPL LICENSE BLOCK ======================== import bpy -from math import sin, cos, pi +from math import cos, pi from rigify.utils import MetarigError from rigify.utils import copy_bone -from rigify.utils import strip_org, deformer, mch +from rigify.utils import strip_org, deformer from rigify.utils import create_widget import re diff --git a/rigify/rigs/spine.py b/rigify/rigs/spine.py index 86d9ba6c..740cfa7e 100644 --- a/rigify/rigs/spine.py +++ b/rigify/rigs/spine.py @@ -75,7 +75,7 @@ class Rig: self.pivot_rest = min(self.pivot_rest, 1.0-(1.0/len(self.org_bones))) if len(self.org_bones) <= 1: - raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone))) + raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name))) def gen_deform(self): """ Generate the deformation rig. diff --git a/rigify/ui.py b/rigify/ui.py index 3a2e89e3..7551ce86 100644 --- a/rigify/ui.py +++ b/rigify/ui.py @@ -21,7 +21,6 @@ from bpy.props import * import rigify from rigify.utils import get_rig_type from rigify import generate -from rna_prop_ui import rna_idprop_ui_prop_get class DATA_PT_rigify_buttons(bpy.types.Panel): @@ -58,7 +57,7 @@ class DATA_PT_rigify_buttons(bpy.types.Panel): id_store.rigify_types.remove(0) for r in rigify.rig_list: - collection = r.split('.')[0] + # collection = r.split('.')[0] # UNUSED if collection_name == "All": a = id_store.rigify_types.add() a.name = r @@ -95,13 +94,12 @@ class DATA_PT_rigify_layer_names(bpy.types.Panel): return True def draw(self, context): - C = context layout = self.layout obj = context.object # Ensure that the layers exist for i in range(1 + len(obj.data.rigify_layers), 29): - layer = obj.data.rigify_layers.add() + obj.data.rigify_layers.add() # UI for i in range(28): @@ -151,7 +149,7 @@ class BONE_PT_rigify_buttons(bpy.types.Panel): id_store.rigify_types.remove(0) for r in rigify.rig_list: - collection = r.split('.')[0] + # collection = r.split('.')[0] # UNUSED if collection_name == "All": a = id_store.rigify_types.add() a.name = r diff --git a/rigify/utils.py b/rigify/utils.py index 311ef24d..d9135271 100644 --- a/rigify/utils.py +++ b/rigify/utils.py @@ -21,7 +21,6 @@ import imp import random import time from mathutils import Vector -from math import ceil, floor from rna_prop_ui import rna_idprop_ui_prop_get RIG_DIR = "rigs" # Name of the directory where rig types are kept @@ -386,7 +385,7 @@ def copy_attributes(a, b): and key != "bl_rna": try: setattr(b, key, getattr(a, key)) - except AttributeError as e: + except AttributeError: pass |