[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28555] trunk/blender/release/scripts/ modules: manually sync rigify with render branch
Campbell Barton
ideasman42 at gmail.com
Mon May 3 21:12:11 CEST 2010
Revision: 28555
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28555
Author: campbellbarton
Date: 2010-05-03 21:12:11 +0200 (Mon, 03 May 2010)
Log Message:
-----------
manually sync rigify with render branch
fixes [#22231] Rigify Script Error When Generate From Human(Meta-Rig)
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rigify/arm_biped.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.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_control.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/tail_control.py
trunk/blender/release/scripts/modules/rigify/tongue.py
trunk/blender/release/scripts/modules/rigify_utils.py
Modified: trunk/blender/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/arm_biped.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/arm_biped.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -192,7 +192,7 @@
# shoulder is used as a hinge
fk_chain.rename("shoulder", "MCH-%s_hinge" % base_names[mt.arm])
- fk_chain.shoulder_e.translate(Vector(0.0, fk_chain.shoulder_e.length / 2, 0.0))
+ fk_chain.shoulder_e.translate(Vector((0.0, fk_chain.shoulder_e.length / 2, 0.0)))
# upper arm constrains to this.
ex.socket_e = copy_bone_simple(arm, mt.arm, "MCH-%s_socket" % base_names[mt.arm])
@@ -240,7 +240,7 @@
con.name = "hinge"
con.target = obj
con.subtarget = mt.shoulder
- driver_fcurve = con.driver_add("influence", 0)
+ driver_fcurve = con.driver_add("influence")
driver = driver_fcurve.driver
Modified: trunk/blender/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -57,7 +57,7 @@
if driver_s.data_path == driver_path:
fcurve = driver_s
if fcurve == None:
- fcurve = obj.data.shape_keys.keys[name].driver_add("value", 0)
+ fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
new = True
@@ -217,7 +217,7 @@
eyes += ["ORG-"+name]
# Get the average position of the eyes
- center = Vector(0,0,0)
+ center = Vector((0, 0, 0))
for eye in eyes:
center += eb[eye].head
if len(eyes) != 0:
@@ -295,7 +295,7 @@
con.target = obj
con.subtarget = head
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
mod = fcurve.modifiers[0]
Modified: trunk/blender/release/scripts/modules/rigify/eye_lid.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_lid.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/eye_lid.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -299,14 +299,15 @@
lid8 = copy_bone_simple(obj.data, definitions[9], base_names[definitions[9]]).name
size = eb[lid1].length
- eb[lid1].tail = eb[lid1].head + Vector(0,size,0)
- eb[lid2].tail = eb[lid2].head + Vector(0,size,0)
- eb[lid3].tail = eb[lid3].head + Vector(0,size,0)
- eb[lid4].tail = eb[lid4].head + Vector(0,size,0)
- eb[lid5].tail = eb[lid5].head + Vector(0,size,0)
- eb[lid6].tail = eb[lid6].head + Vector(0,size,0)
- eb[lid7].tail = eb[lid7].head + Vector(0,size,0)
- eb[lid8].tail = eb[lid8].head + Vector(0,size,0)
+ size_y = Vector(0.0, size, 0.0)
+ eb[lid1].tail = eb[lid1].head + size_y
+ eb[lid2].tail = eb[lid2].head + size_y
+ eb[lid3].tail = eb[lid3].head + size_y
+ eb[lid4].tail = eb[lid4].head + size_y
+ eb[lid5].tail = eb[lid5].head + size_y
+ eb[lid6].tail = eb[lid6].head + size_y
+ eb[lid7].tail = eb[lid7].head + size_y
+ eb[lid8].tail = eb[lid8].head + size_y
eb[lid1].roll = 0
eb[lid2].roll = 0
@@ -438,7 +439,7 @@
con.minimum = -distance*2
con.maximum = distance
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -457,7 +458,7 @@
con.minimum = -distance*2
con.maximum = distance
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -475,7 +476,7 @@
con.minimum = -distance*2
con.maximum = distance
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -493,7 +494,7 @@
con.minimum = -distance*2
con.maximum = distance
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -511,7 +512,7 @@
con.minimum = -distance*2
con.maximum = distance
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -530,7 +531,7 @@
con.minimum = -distance
con.maximum = distance*2
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -548,7 +549,7 @@
con.minimum = -distance
con.maximum = distance*2
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -566,7 +567,7 @@
con.minimum = -distance
con.maximum = distance*2
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -584,7 +585,7 @@
con.minimum = -distance
con.maximum = distance*2
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
@@ -602,7 +603,7 @@
con.minimum = -distance
con.maximum = distance*2
con.target_space = 'LOCAL'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
driver.type = 'AVERAGE'
var = driver.variables.new()
Modified: trunk/blender/release/scripts/modules/rigify/finger_curl.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/finger_curl.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/finger_curl.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -291,7 +291,7 @@
hinge_driver_path = pb[control].path_from_id() + '["hinge"]'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
var = driver.variables.new()
driver.type = 'AVERAGE'
Modified: trunk/blender/release/scripts/modules/rigify/leg_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_biped.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/leg_biped.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -201,7 +201,7 @@
ik.knee_target_e.local_location = False
# roll the bone to point up... could also point in the same direction as ik.foot_roll
- # ik.foot_roll_02_e.matrix * Vector(0.0, 0.0, 1.0) # ACK!, no rest matrix in editmode
+ # ik.foot_roll_02_e.matrix * Vector((0.0, 0.0, 1.0)) # ACK!, no rest matrix in editmode
ik.foot_roll_01_e.align_roll((0.0, 0.0, -1.0))
bpy.ops.object.mode_set(mode='OBJECT')
@@ -298,7 +298,7 @@
ex.thigh_socket_e = copy_bone_simple(arm, mt_chain.thigh, "MCH-%s_socket" % base_names[mt_chain.thigh], parent=True)
ex.thigh_socket = ex.thigh_socket_e.name
- ex.thigh_socket_e.tail = ex.thigh_socket_e.head + Vector(0.0, 0.0, ex.thigh_socket_e.length / 4.0)
+ ex.thigh_socket_e.tail = ex.thigh_socket_e.head + Vector((0.0, 0.0, ex.thigh_socket_e.length / 4.0))
ex.thigh_hinge_e = copy_bone_simple(arm, mt.hips, "MCH-%s_hinge" % base_names[mt_chain.thigh], parent=False)
ex.thigh_hinge = ex.thigh_hinge_e.name
@@ -351,7 +351,7 @@
# add driver
hinge_driver_path = fk_chain.thigh_p.path_from_id() + '["hinge"]'
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
var = driver.variables.new()
driver.type = 'AVERAGE'
Modified: trunk/blender/release/scripts/modules/rigify/leg_quadruped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_quadruped.py 2010-05-03 17:13:12 UTC (rev 28554)
+++ trunk/blender/release/scripts/modules/rigify/leg_quadruped.py 2010-05-03 19:12:11 UTC (rev 28555)
@@ -160,7 +160,7 @@
ik.foot_roll_e.parent = ik_chain.foot_e
ik.foot_roll_e.head -= mt_chain.toe_e.vector.normalize() * mt_chain.foot_e.length
ik.foot_roll_e.tail = ik.foot_roll_e.head - (mt_chain.foot_e.vector.normalize() * mt_chain.toe_e.length)
- ik.foot_roll_e.align_roll(mt_chain.foot_e.matrix.rotation_part() * Vector(0.0, 0.0, -1.0))
+ ik.foot_roll_e.align_roll(mt_chain.foot_e.matrix.rotation_part() * Vector((0.0, 0.0, -1.0)))
# MCH-foot
ik.foot_roll_01_e = copy_bone_simple(arm, mt_chain.foot, "MCH-" + base_names[mt_chain.foot])
@@ -213,7 +213,7 @@
con = mt_chain.thigh_p.constraints.new('COPY_TRANSFORMS')
con.target = obj
con.subtarget = ik_chain.thigh
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
var = driver.variables.new()
driver.type = 'AVERAGE'
@@ -225,7 +225,7 @@
con = mt_chain.shin_p.constraints.new('COPY_TRANSFORMS')
con.target = obj
con.subtarget = ik_chain.shin
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
var = driver.variables.new()
driver.type = 'AVERAGE'
@@ -237,7 +237,7 @@
con = mt_chain.foot_p.constraints.new('COPY_TRANSFORMS')
con.target = obj
con.subtarget = ik.foot_roll_02
- fcurve = con.driver_add("influence", 0)
+ fcurve = con.driver_add("influence")
driver = fcurve.driver
var = driver.variables.new()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list