diff --git a/rigify/__init__.py b/rigify/__init__.py index fc8eb8184100400e9bf8e158e20b9bddb60b4771..8ec2691318d5112a2aa2ebd8dc3edeae5a7e3478 100644 --- a/rigify/__init__.py +++ b/rigify/__init__.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + bl_info = { "name": "Rigify", "author": "Nathan Vegdahl", @@ -24,10 +26,10 @@ bl_info = { "location": "View3D > Add > Armature", "description": "Adds various Rig Templates", "location": "Armature properties", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\ - "Scripts/Rigging/Rigify", - "tracker_url": "http://projects.blender.org/tracker/index.php?"\ - "func=detail&aid=25546", + "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/" + "Scripts/Rigging/Rigify", + "tracker_url": "http://projects.blender.org/tracker/index.php?" + "func=detail&aid=25546", "category": "Rigging"} diff --git a/rigify/generate.py b/rigify/generate.py index 8f5e012ae3e6254cfb8121d16b9ba2cf54d5d7e1..2a6bb30848207ebf5e3b084a1b83791e02a0cd4e 100644 --- a/rigify/generate.py +++ b/rigify/generate.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy import re import time @@ -166,7 +168,7 @@ def generate_rig(context, metarig): getattr(bone.rigify_parameters[0], prop)) except AttributeError: print("FAILED TO COPY PARAMETER: " + str(prop)) - + # Custom properties for prop in bone.keys(): try: diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py index fefb4bd61096bda08c7026235fe450f8be4e3041..d5366480b3e4335b40215350e1a2ba1e33dd8d2e 100644 --- a/rigify/metarig_menu.py +++ b/rigify/metarig_menu.py @@ -16,6 +16,8 @@ # # ##### END GPL LICENSE BLOCK ##### +# <pep8 compliant> + import bpy from rigify.metarigs import human @@ -53,4 +55,3 @@ def unregister(): bpy.utils.unregister_class(AddHuman) bpy.types.INFO_MT_armature_add.remove(menu_func) - diff --git a/rigify/metarigs/human.py b/rigify/metarigs/human.py index cfc9f0380123c051682a9f93c4f3e1b47cd96a00..23ec2483ae3917976ddd2adcbfe43f1093d9fd7d 100644 --- a/rigify/metarigs/human.py +++ b/rigify/metarigs/human.py @@ -16,6 +16,8 @@ # # ##### END GPL LICENSE BLOCK ##### +# <pep8 compliant> + import bpy @@ -1146,4 +1148,3 @@ def create(obj): arm.edit_bones.active = bone arm.layers = [(x in [0, 2, 4, 6, 8, 10, 12]) for x in range(0, 32)] - diff --git a/rigify/rig_ui_template.py b/rigify/rig_ui_template.py index f21c409667bede34a817bcb1e886e11293368c55..c793dadee87a3dc6f721cf0c4f4d84340ac678e2 100644 --- a/rigify/rig_ui_template.py +++ b/rigify/rig_ui_template.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + UI_SLIDERS = ''' import bpy from mathutils import Matrix, Vector @@ -543,7 +545,6 @@ class RigLayers(bpy.types.Panel): code += "\n row = col.row()\n" code += " row.prop(context.active_object.data, 'layers', index=28, toggle=True, text='Root')\n" - return code @@ -567,4 +568,3 @@ def unregister(): register() ''' - diff --git a/rigify/rigs/basic/copy.py b/rigify/rigs/basic/copy.py index 6a8800b2312f6ed666f697c21c4bebc4f0afd0d7..f0c5c380bb1325645d8c5b7de3010ce1282762a8 100644 --- a/rigify/rigs/basic/copy.py +++ b/rigify/rigs/basic/copy.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from rigify.utils import copy_bone from rigify.utils import strip_org, make_deformer_name @@ -88,7 +90,6 @@ class Rig: group.make_control = bpy.props.BoolProperty(name="Control", default=True, description="Create a control bone for the copy") group.make_deform = bpy.props.BoolProperty(name="Deform", default=True, description="Create a deform bone for the copy") - @classmethod def parameters_ui(self, layout, obj, bone): """ Create the ui for the rig parameters. @@ -139,4 +140,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/basic/copy_chain.py b/rigify/rigs/basic/copy_chain.py index 937b02f62ec4b9147b450ad178caecf5ae139b14..eaff060f9b888255f26a266e150776b22b7d7345 100644 --- a/rigify/rigs/basic/copy_chain.py +++ b/rigify/rigs/basic/copy_chain.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from rigify.utils import MetarigError from rigify.utils import copy_bone @@ -127,7 +129,6 @@ class Rig: group.make_controls = bpy.props.BoolProperty(name="Controls", default=True, description="Create control bones for the copy") group.make_deforms = bpy.props.BoolProperty(name="Deform", default=True, description="Create deform bones for the copy") - @classmethod def parameters_ui(self, layout, obj, bone): """ Create the ui for the rig parameters. @@ -206,5 +207,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - - diff --git a/rigify/rigs/biped/arm/__init__.py b/rigify/rigs/biped/arm/__init__.py index 55cd2564e056b579b5cd65b156b84e4a0b7ef79e..b22be16b9850cac8806c99adc3bf16edd36cadba 100644 --- a/rigify/rigs/biped/arm/__init__.py +++ b/rigify/rigs/biped/arm/__init__.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy import imp from . import fk, ik, deform @@ -231,4 +233,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/biped/arm/deform.py b/rigify/rigs/biped/arm/deform.py index 112c5550da2cc332bda28ed228a8cc53b385bd8e..4ed2cc479e9d173308e320fc6e90154840ed44d5 100644 --- a/rigify/rigs/biped/arm/deform.py +++ b/rigify/rigs/biped/arm/deform.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from math import acos from mathutils import Vector, Matrix @@ -227,4 +229,3 @@ class Rig: con.name = "track_to" con.target = self.obj con.subtarget = ftip - diff --git a/rigify/rigs/biped/arm/fk.py b/rigify/rigs/biped/arm/fk.py index 690dab505a46a4150c8a6818e1dc9a93a69ec7be..77031227262b56b0eb8f71497ff00f2e5e0842c9 100644 --- a/rigify/rigs/biped/arm/fk.py +++ b/rigify/rigs/biped/arm/fk.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from rigify.utils import MetarigError from rigify.utils import copy_bone @@ -213,4 +215,3 @@ class Rig: mod.levels = 2 return [uarm, farm, hand] - diff --git a/rigify/rigs/biped/arm/ik.py b/rigify/rigs/biped/arm/ik.py index 55147a47d987acf12a26ee5feab23829aac1e30a..70720ac92bfdec873e4cb2305944395a05df7103 100644 --- a/rigify/rigs/biped/arm/ik.py +++ b/rigify/rigs/biped/arm/ik.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from mathutils import Vector from math import pi, acos @@ -335,4 +337,3 @@ class Rig: mod.levels = 2 return [uarm, farm, hand, pole] - diff --git a/rigify/rigs/biped/leg/__init__.py b/rigify/rigs/biped/leg/__init__.py index c80376a831d122fe597b99dbe9eb59a4339fa1db..3827d7ccfce39971570ac3c38d23adb6ca2a9265 100644 --- a/rigify/rigs/biped/leg/__init__.py +++ b/rigify/rigs/biped/leg/__init__.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy import imp from . import fk, ik, deform @@ -268,4 +270,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/biped/leg/deform.py b/rigify/rigs/biped/leg/deform.py index 5ea8cf65199577c74ee35a23e52b22f1abdefd51..e7cd3194006bab2631ae265cf97d04101589a6fb 100644 --- a/rigify/rigs/biped/leg/deform.py +++ b/rigify/rigs/biped/leg/deform.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from math import acos from mathutils import Vector, Matrix diff --git a/rigify/rigs/biped/leg/fk.py b/rigify/rigs/biped/leg/fk.py index 5ff9d4a9a7fec18708933dc7570ea95316e33f66..270fffdb62ff99c13723785b4c191d1ad0a69db3 100644 --- a/rigify/rigs/biped/leg/fk.py +++ b/rigify/rigs/biped/leg/fk.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from mathutils import Vector from rigify.utils import MetarigError @@ -251,4 +253,3 @@ class Rig: mod.levels = 2 return [thigh, shin, foot, foot_mch] - diff --git a/rigify/rigs/biped/leg/ik.py b/rigify/rigs/biped/leg/ik.py index cfac143038eed2321dd6936fe0eb2594df6efe52..d114b942dc3bffd19a6b32ad95a1887e76c483d0 100644 --- a/rigify/rigs/biped/leg/ik.py +++ b/rigify/rigs/biped/leg/ik.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from mathutils import Vector from math import pi, acos @@ -604,4 +606,3 @@ class Rig: mod.levels = 2 return [thigh, shin, foot, pole, foot_roll, foot_ik_target] - diff --git a/rigify/rigs/finger.py b/rigify/rigs/finger.py index 523a9eddaf7611908c100287dc00e6ab0fb3191f..7961a5fd908943720087412f71fa612798161c56 100644 --- a/rigify/rigs/finger.py +++ b/rigify/rigs/finger.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from mathutils import Vector from rigify.utils import MetarigError @@ -408,4 +410,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/misc/delta.py b/rigify/rigs/misc/delta.py index 2db278f0b1b7ce5bf6988bdffe0b4f81d6a84b45..d61cf695c691d043fbf467946a359319cccd7c4e 100644 --- a/rigify/rigs/misc/delta.py +++ b/rigify/rigs/misc/delta.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from math import acos from rigify.utils import MetarigError @@ -158,4 +160,3 @@ def set_mat(obj, bone_name, matrix): a.roll = roll_1 else: a.roll = roll_2 - diff --git a/rigify/rigs/neck_short.py b/rigify/rigs/neck_short.py index edba5c8d7283f3cf3345afee46669831038b2dea..074208752430ff54cf113b6912c1c4ecfc4bac9a 100644 --- a/rigify/rigs/neck_short.py +++ b/rigify/rigs/neck_short.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from rigify.utils import MetarigError from rigify.utils import copy_bone, new_bone, put_bone @@ -388,4 +390,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/palm.py b/rigify/rigs/palm.py index 1309f626a687228ea949f59bfed34f8c6b714cb2..1d25050a153d790509b060e2a4841290c898d0df 100644 --- a/rigify/rigs/palm.py +++ b/rigify/rigs/palm.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from math import cos, pi from rigify.utils import MetarigError @@ -270,4 +272,3 @@ class Rig: bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - diff --git a/rigify/rigs/spine.py b/rigify/rigs/spine.py index 1b77c4c3cc2d30c422778cf962a47bd72f3e5b9e..cee086152a3dd730c5ed2c68f37342afdcf00947 100644 --- a/rigify/rigs/spine.py +++ b/rigify/rigs/spine.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + """ TODO: - Add parameters for bone transform alphas. """ @@ -71,8 +73,8 @@ class Rig: self.control_indices.sort() self.pivot_rest = self.params.rest_pivot_slide - self.pivot_rest = max(self.pivot_rest, 1.0/len(self.org_bones)) - self.pivot_rest = min(self.pivot_rest, 1.0-(1.0/len(self.org_bones))) + self.pivot_rest = max(self.pivot_rest, 1.0 / len(self.org_bones)) + 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_name))) @@ -532,7 +534,6 @@ class Rig: group.rest_pivot_slide = bpy.props.FloatProperty(name="Rest Pivot Slide", default=0.0, min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, description="The pivot slide value in the rest pose") group.chain_bone_controls = bpy.props.StringProperty(name="Control bone list", default="", description="Define which bones have controls") - @classmethod def parameters_ui(self, layout, obj, bone): """ Create the ui for the rig parameters. diff --git a/rigify/ui.py b/rigify/ui.py index f187490b0bea437689d0ee8add8c88de669dff12..bc5c4d8ff423f36081b2eb4cb1deea672a724909 100644 --- a/rigify/ui.py +++ b/rigify/ui.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy from bpy.props import * import rigify diff --git a/rigify/utils.py b/rigify/utils.py index 64b42dcd77acd9705b1538c561728eb0df04d2ef..197a1a255dec9d7c8d98ce081882b8d821f4c2a9 100644 --- a/rigify/utils.py +++ b/rigify/utils.py @@ -16,6 +16,8 @@ # #======================= END GPL LICENSE BLOCK ======================== +# <pep8 compliant> + import bpy import imp import random @@ -358,6 +360,7 @@ def create_compass_widget(rig, bone_name): mesh.from_pydata(verts, edges, []) mesh.update() + def create_root_widget(rig, bone_name): """ Creates a widget for the root bone. """ @@ -536,7 +539,7 @@ def write_metarig(obj, layers=False, func_name="create_sample"): return "\n".join(code) -def random_id(length = 8): +def random_id(length=8): """ Generates a random alphanumeric id string. """ tlength = int(length / 2) @@ -548,4 +551,3 @@ def random_id(length = 8): text += random.choice(chars) text += str(hex(int(time.time())))[2:][-tlength:].rjust(tlength, '0')[::-1] return text -