[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26470] trunk/blender/release/scripts/ modules/rigify: white space commit, so the actual changes in the next commiy wont be so hard to find
Campbell Barton
ideasman42 at gmail.com
Sun Jan 31 15:30:21 CET 2010
Revision: 26470
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26470
Author: campbellbarton
Date: 2010-01-31 15:30:21 +0100 (Sun, 31 Jan 2010)
Log Message:
-----------
white space commit, so the actual changes in the next commiy wont be so hard to find
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rigify/__init__.py
trunk/blender/release/scripts/modules/rigify/arm_biped.py
trunk/blender/release/scripts/modules/rigify/copy.py
trunk/blender/release/scripts/modules/rigify/eye_balls.py
trunk/blender/release/scripts/modules/rigify/eye_lid.py
trunk/blender/release/scripts/modules/rigify/finger_curl.py
trunk/blender/release/scripts/modules/rigify/leg_biped.py
trunk/blender/release/scripts/modules/rigify/leg_quadruped.py
trunk/blender/release/scripts/modules/rigify/mouth.py
trunk/blender/release/scripts/modules/rigify/neck_flex.py
trunk/blender/release/scripts/modules/rigify/palm_curl.py
trunk/blender/release/scripts/modules/rigify/shape_key_distance.py
trunk/blender/release/scripts/modules/rigify/shape_key_rotdiff.py
trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
trunk/blender/release/scripts/modules/rigify/stretch.py
trunk/blender/release/scripts/modules/rigify/stretch_twist.py
trunk/blender/release/scripts/modules/rigify/track_dual.py
trunk/blender/release/scripts/modules/rigify/track_reverse.py
Modified: trunk/blender/release/scripts/modules/rigify/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/__init__.py 2010-01-31 11:15:51 UTC (rev 26469)
+++ trunk/blender/release/scripts/modules/rigify/__init__.py 2010-01-31 14:30:21 UTC (rev 26470)
@@ -29,7 +29,7 @@
ORG_LAYERS = [n==31 for n in range(0,32)]
MCH_LAYERS = [n==30 for n in range(0,32)]
DEF_LAYERS = [n==29 for n in range(0,32)]
-ROOT_LAYERS = [n==28 for n in range(0,32)]
+ROOT_LAYERS = [n==28 for n in range(0,32)]
ORG_PREFIX = "ORG-"
MCH_PREFIX = "MCH-"
@@ -154,7 +154,7 @@
from collections import OrderedDict
import rigify_utils
reload(rigify_utils)
-
+
print("Begin...")
# Not needed but catches any errors before duplicating
@@ -178,63 +178,63 @@
name = obj_orig["rig_object_name"]
except KeyError:
name = "rig"
-
+
try:
obj = scene.objects[name]
except KeyError:
obj = bpy.data.objects.new(name, type='ARMATURE')
obj.data = bpy.data.armatures.new(name)
scene.objects.link(obj)
-
+
obj.data.pose_position = 'POSE'
-
+
# Get rid of anim data in case the rig already existed
print("Clear rig animation data.")
obj.animation_data_clear()
-
+
# Select generated rig object
obj_orig.selected = False
obj.selected = True
scene.objects.active = obj
-
+
# Remove all bones from the generated rig armature.
bpy.ops.object.mode_set(mode='EDIT')
for bone in obj.data.edit_bones:
obj.data.edit_bones.remove(bone)
bpy.ops.object.mode_set(mode='OBJECT')
-
+
# Create temporary duplicates for merging
temp_rig_1 = obj_orig.copy()
temp_rig_1.data = obj_orig.data.copy()
scene.objects.link(temp_rig_1)
-
+
temp_rig_2 = obj_orig.copy()
temp_rig_2.data = obj.data
scene.objects.link(temp_rig_2)
-
+
# Select the temp rigs for merging
for objt in scene.objects:
objt.selected = False # deselect all objects
temp_rig_1.selected = True
temp_rig_2.selected = True
scene.objects.active = temp_rig_2
-
+
# Merge the temporary rigs
bpy.ops.object.join(context)
-
+
# Delete the second temp rig
bpy.ops.object.delete()
-
+
# Select the generated rig
for objt in scene.objects:
objt.selected = False # deselect all objects
obj.selected = True
scene.objects.active = obj
-
+
# Copy over the pose_bone properties
for bone in obj_orig.pose.bones:
bone_gen = obj.pose.bones[bone.name]
-
+
# Rotation mode and transform locks
bone_gen.rotation_mode = bone.rotation_mode
bone_gen.lock_rotation = tuple(bone.lock_rotation)
@@ -242,28 +242,28 @@
bone_gen.lock_rotations_4d = bone.lock_rotations_4d
bone_gen.lock_location = tuple(bone.lock_location)
bone_gen.lock_scale = tuple(bone.lock_scale)
-
+
# Custom properties
for prop in bone.keys():
bone_gen[prop] = bone[prop]
-
+
# Copy over bone properties
for bone in obj_orig.data.bones:
bone_gen = obj.data.bones[bone.name]
-
+
# B-bone stuff
bone_gen.bbone_segments = bone.bbone_segments
bone_gen.bbone_in = bone.bbone_in
bone_gen.bbone_out = bone.bbone_out
-
-
+
+
# Create proxy deformation rig
# TODO: remove this
if META_DEF:
obj_def = obj_orig.copy()
obj_def.data = obj_orig.data.copy()
scene.objects.link(obj_def)
-
+
scene.update()
print("On to the real work.")
@@ -474,7 +474,7 @@
obj.data.pose_position = 'POSE'
obj_orig.data.pose_position = 'POSE'
context.user_preferences.edit.global_undo = global_undo
-
+
print("Done.\n")
return obj
Modified: trunk/blender/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/arm_biped.py 2010-01-31 11:15:51 UTC (rev 26469)
+++ trunk/blender/release/scripts/modules/rigify/arm_biped.py 2010-01-31 14:30:21 UTC (rev 26470)
@@ -277,14 +277,14 @@
fk_chain.arm_b.layer = layer
fk_chain.forearm_b.layer = layer
fk_chain.hand_b.layer = layer
-
+
# Forearm was getting wrong roll somehow. Hack to fix that.
bpy.ops.object.mode_set(mode='EDIT')
fk_chain.update()
mt.update()
fk_chain.forearm_e.roll = mt.forearm_e.roll
bpy.ops.object.mode_set(mode='OBJECT')
-
+
bpy.ops.object.mode_set(mode='EDIT')
return None, fk_chain.arm, fk_chain.forearm, fk_chain.hand
@@ -301,7 +301,7 @@
center = uarm1.center
uarm1.tail = center
uarm2.head = center
-
+
# Create forearm bones: two bones, each half of the forearm.
farm1 = copy_bone_simple(obj.data, definitions[2], "DEF-%s.01" % base_names[definitions[2]], parent=True)
farm2 = copy_bone_simple(obj.data, definitions[2], "DEF-%s.02" % base_names[definitions[2]], parent=True)
@@ -311,16 +311,16 @@
center = farm1.center
farm1.tail = center
farm2.head = center
-
+
# Create twist bone
twist = copy_bone_simple(obj.data, definitions[2], "MCH-arm_twist")
twist.connected = False
twist.parent = obj.data.edit_bones[definitions[3]]
twist.length /= 2
-
+
# Create hand bone
hand = copy_bone_simple(obj.data, definitions[3], "DEF-%s" % base_names[definitions[3]], parent=True)
-
+
# Store names before leaving edit mode
uarm1_name = uarm1.name
uarm2_name = uarm2.name
@@ -328,10 +328,10 @@
farm2_name = farm2.name
twist_name = twist.name
hand_name = hand.name
-
+
# Leave edit mode
bpy.ops.object.mode_set(mode='OBJECT')
-
+
# Get the pose bones
uarm1 = obj.pose.bones[uarm1_name]
uarm2 = obj.pose.bones[uarm2_name]
@@ -339,50 +339,50 @@
farm2 = obj.pose.bones[farm2_name]
twist = obj.pose.bones[twist_name]
hand = obj.pose.bones[hand_name]
-
+
# Upper arm constraints
con = uarm1.constraints.new('DAMPED_TRACK')
con.name = "trackto"
con.target = obj
con.subtarget = definitions[2]
-
+
con = uarm1.constraints.new('COPY_SCALE')
con.name = "trackto"
con.target = obj
con.subtarget = definitions[1]
-
+
con = uarm2.constraints.new('COPY_ROTATION')
con.name = "copy_rot"
con.target = obj
con.subtarget = definitions[1]
-
+
# Forearm constraints
con = farm1.constraints.new('COPY_ROTATION')
con.name = "copy_rot"
con.target = obj
con.subtarget = definitions[2]
-
+
con = farm1.constraints.new('COPY_SCALE')
con.name = "copy_rot"
con.target = obj
con.subtarget = definitions[2]
-
+
con = farm2.constraints.new('COPY_ROTATION')
con.name = "copy_rot"
con.target = obj
con.subtarget = twist.name
-
+
con = farm2.constraints.new('DAMPED_TRACK')
con.name = "trackto"
con.target = obj
con.subtarget = definitions[3]
-
+
# Hand constraint
con = hand.constraints.new('COPY_ROTATION')
con.name = "copy_rot"
con.target = obj
con.subtarget = definitions[3]
-
+
bpy.ops.object.mode_set(mode='EDIT')
return (uarm1_name, uarm2_name, farm1_name, farm2_name, hand_name)
Modified: trunk/blender/release/scripts/modules/rigify/copy.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/copy.py 2010-01-31 11:15:51 UTC (rev 26469)
+++ trunk/blender/release/scripts/modules/rigify/copy.py 2010-01-31 14:30:21 UTC (rev 26470)
@@ -50,28 +50,28 @@
# Create deform bone.
bone = copy_bone_simple(obj.data, definitions[0], "DEF-%s" % base_names[definitions[0]], parent=True)
-
+
# Store name before leaving edit mode
bone_name = bone.name
-
+
# Leave edit mode
bpy.ops.object.mode_set(mode='OBJECT')
-
+
# Get the pose bone
bone = obj.pose.bones[bone_name]
-
+
# Constrain to the original bone
con = bone.constraints.new('COPY_TRANSFORMS')
con.name = "copy_loc"
con.target = obj
con.subtarget = definitions[0]
-
+
return (bone_name,)
def control(obj, definitions, base_names, options):
bpy.ops.object.mode_set(mode='EDIT')
-
+
arm = obj.data
mt = bone_class_instance(obj, METARIG_NAMES)
mt.cpy = definitions[0]
@@ -97,10 +97,10 @@
cp.cpy_p.lock_rotation = tuple(mt.cpy_p.lock_rotation)
cp.cpy_p.lock_rotation_w = mt.cpy_p.lock_rotation_w
cp.cpy_p.lock_scale = tuple(mt.cpy_p.lock_scale)
-
+
# Layers
cp.cpy_b.layer = list(mt.cpy_b.layer)
-
+
return (mt.cpy,)
Modified: trunk/blender/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-01-31 11:15:51 UTC (rev 26469)
+++ trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-01-31 14:30:21 UTC (rev 26470)
@@ -37,7 +37,7 @@
if action.tag != True:
return action
return None
-
+
def add_action(name=None):
mark_actions()
bpy.ops.action.new()
@@ -66,46 +66,46 @@
def metarig_definition(obj, orig_bone_name):
bone = obj.data.bones[orig_bone_name]
chain = []
-
+
try:
chain += [bone.parent.name, bone.name]
except AttributeError:
raise RigifyError("'%s' rig type requires a parent (bone: %s)" % (RIG_TYPE, base_names[0]))
-
+
return chain
def deform(obj, definitions, base_names, options):
bpy.ops.object.mode_set(mode='EDIT')
-
+
eb = obj.data.edit_bones
pb = obj.pose.bones
-
+
# Get list of eyes
if "eyes" in options:
eye_base_names = options["eyes"].replace(" ", "").split(",")
else:
eye_base_names = []
-
+
# Get their ORG- names
eyes = []
for name in eye_base_names:
eyes += ["ORG-"+name]
-
+
# Duplicate the eyes to make deformation bones
def_eyes = [] # def/org pairs
for eye in eyes:
def_eyes += [(copy_bone_simple(obj.data, eye, "DEF-"+base_names[eye], parent=True).name, eye)]
-
-
+
+
bpy.ops.object.mode_set(mode='OBJECT')
-
+
# Constraints
for eye in def_eyes:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list