diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-08 12:40:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-08 12:40:30 +0300 |
| commit | fccceaa87fb1e883c5d29113dc8b7d33786c8c1e (patch) | |
| tree | e45312a32b8815807f968918044cc264443b8ab9 /release | |
| parent | c146ce977cea962e82f9b542bdf4d342d6ec0d2a (diff) | |
- pyrna support for (value in array), currently only 1 dimensional arrays.
- use python malloc's in bpy_array.c
- automatically blending bone locations is disabled if the target bone has locked location
- neck had incorrect roll
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/rigify/__init__.py | 3 | ||||
| -rw-r--r-- | release/scripts/modules/rigify/neck.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index cf6e17a895f..f33ba9edc56 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -272,7 +272,8 @@ def blend_bone_list(obj, apply_bones, from_bones, to_bones, target_bone=None, ta new_pbone = obj.pose.bones[new_bone_name] - if not new_pbone.bone.connected: + # if the bone is connected or its location is totally locked then dont add location blending. + if not (new_pbone.bone.connected or (False not in new_pbone.lock_location)): blend_location(new_pbone, from_bone_name, to_bone_name) blend_rotation(new_pbone, from_bone_name, to_bone_name) diff --git a/release/scripts/modules/rigify/neck.py b/release/scripts/modules/rigify/neck.py index d20c231c0f8..9c7e53fa52d 100644 --- a/release/scripts/modules/rigify/neck.py +++ b/release/scripts/modules/rigify/neck.py @@ -160,7 +160,7 @@ def main(obj, bone_definition, base_names): neck_e_parent = arm.edit_bones.new("MCH-rot_%s" % neck_e.name) neck_e_parent.head = neck_e.head neck_e_parent.tail = neck_e.head + ((mt.head_e.tail - mt.head_e.head).normalize() * neck_chain_segment_length / 2.0) - neck_e_parent.roll = neck_e.roll + neck_e_parent.roll = mt.head_e.roll orig_parent = neck_e.parent |