From 3428aad9c8ea3438219eeffb3f0964eeae1f57d9 Mon Sep 17 00:00:00 2001
From: Nathan Vegdahl <cessen@cessen.com>
Date: Mon, 21 Feb 2011 20:29:27 +0000
Subject: [PATCH] Rigify works again! Yay! Just required some misc updates due
to python API changes.
---
rigify/README | 2 +-
rigify/__init__.py | 14 +++++++-------
rigify/rigs/biped/arm/ik.py | 6 +++---
rigify/rigs/biped/leg/__init__.py | 1 +
rigify/rigs/biped/leg/fk.py | 2 +-
rigify/rigs/biped/leg/ik.py | 8 ++++----
6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/rigify/README b/rigify/README
index 39e8cda65..69118e3ac 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 9ffad7ac6..8a443fa0b 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 2b941b9e6..403d1d0dd 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 4c9997bf5..3c518320b 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 a212d4458..628798f8b 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 a04b57dc5..6dc232dfd 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
--
GitLab