diff --git a/rigify/README b/rigify/README index 39e8cda65a5c3555f1795feaca1736546f77a159..69118e3ac91ec1b3e47c8d69797edf085661e67b 100644 --- a/rigify/README +++ b/rigify/README @@ -2,7 +2,7 @@ INTRODUCTION ------------ Rigify is an auto-rigging system based on a "building blocks" paradigm. The user can create a rig by putting together any combination of rig types, in any -confguration that they want. +configuration that they want. A rig type is something like "biped arm" or "spine" or "finger". diff --git a/rigify/__init__.py b/rigify/__init__.py index 9ffad7ac6f0890ee68d8947ccd6dba2c2f6678aa..8a443fa0bb007a01bff2d3bd52d1ff913d073816 100644 --- a/rigify/__init__.py +++ b/rigify/__init__.py @@ -116,13 +116,6 @@ class RigifyParameters(bpy.types.PropertyGroup): name = bpy.props.StringProperty() -for rig in rig_list: - r = utils.get_rig_type(rig).Rig - try: - r.add_parameters(RigifyParameters) - except AttributeError: - pass - ##### REGISTER ##### @@ -141,6 +134,13 @@ def register(): IDStore.rigify_types = bpy.props.CollectionProperty(type=RigifyName) IDStore.rigify_active_type = bpy.props.IntProperty(name="Rigify Active Type", description="The selected rig type.") + # Add rig parameters + for rig in rig_list: + r = utils.get_rig_type(rig).Rig + try: + r.add_parameters(RigifyParameters) + except AttributeError: + pass def unregister(): del bpy.types.PoseBone.rigify_type diff --git a/rigify/rigs/biped/arm/ik.py b/rigify/rigs/biped/arm/ik.py index 2b941b9e6cfb5cdc654de0fb56bf43ed9e3ef4ed..403d1d0dd5689cfd9725bbda8e662101e5fde7f5 100644 --- a/rigify/rigs/biped/arm/ik.py +++ b/rigify/rigs/biped/arm/ik.py @@ -158,9 +158,9 @@ class Rig: vispole_e.tail = vispole_e.head + Vector((0, 0, v1.length / 32)) # Determine the pole offset value - plane = (farm_e.tail - uarm_e.head).normalize() - vec1 = uarm_e.x_axis.normalize() - vec2 = (pole_e.head - uarm_e.head).normalize() + plane = (farm_e.tail - uarm_e.head).normalized() + vec1 = uarm_e.x_axis.normalized() + vec2 = (pole_e.head - uarm_e.head).normalized() pole_offset = angle_on_plane(plane, vec1, vec2) # Object mode, get pose bones diff --git a/rigify/rigs/biped/leg/__init__.py b/rigify/rigs/biped/leg/__init__.py index 4c9997bf58b3529dfd63b8db6ebe36aac965e4a8..3c518320b42cda3b692cf01bf6f77cd25cbdf627 100644 --- a/rigify/rigs/biped/leg/__init__.py +++ b/rigify/rigs/biped/leg/__init__.py @@ -78,6 +78,7 @@ class Rig: group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls.") group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on.") + print("Adding thigh twist.") group.use_thigh_twist = bpy.props.BoolProperty(name="Thigh Twist", default=True, description="Generate the dual-bone twist setup for the thigh.") group.use_shin_twist = bpy.props.BoolProperty(name="Shin Twist", default=True, description="Generate the dual-bone twist setup for the shin.") diff --git a/rigify/rigs/biped/leg/fk.py b/rigify/rigs/biped/leg/fk.py index a212d44585b45e19fd0967e4e66992238d394d14..628798f8bf2f6eb909da50b5444956254412bb30 100644 --- a/rigify/rigs/biped/leg/fk.py +++ b/rigify/rigs/biped/leg/fk.py @@ -141,7 +141,7 @@ class Rig: # Positioning vec = Vector(eb[self.org_bones[3]].vector) - vec = vec.normalize() + vec.normalize() foot_e.tail = foot_e.head + (vec * foot_e.length) foot_e.roll = eb[self.org_bones[3]].roll diff --git a/rigify/rigs/biped/leg/ik.py b/rigify/rigs/biped/leg/ik.py index a04b57dc5ec7c12ce9d0762fe4e664ec1acece39..6dc232dfd4eb6c944ee4757909cc6bf890cf7dbf 100644 --- a/rigify/rigs/biped/leg/ik.py +++ b/rigify/rigs/biped/leg/ik.py @@ -221,7 +221,7 @@ class Rig: # Positioning vec = Vector(toe_e.vector) - vec = vec.normalize() + vec.normalize() foot_e.tail = foot_e.head + (vec * foot_e.length) foot_e.roll = toe_e.roll @@ -281,9 +281,9 @@ class Rig: foot_ik_target_e.tail = Vector(org_foot_e.tail) # Determine the pole offset value - plane = (shin_e.tail - thigh_e.head).normalize() - vec1 = thigh_e.x_axis.normalize() - vec2 = (pole_e.head - thigh_e.head).normalize() + plane = (shin_e.tail - thigh_e.head).normalized() + vec1 = thigh_e.x_axis.normalized() + vec2 = (pole_e.head - thigh_e.head).normalized() pole_offset = angle_on_plane(plane, vec1, vec2) # Object mode, get pose bones