[Bf-extensions-cvs] [1f2b5156] master: fix T53356: update bbone_in bbone_out props to bbone_easein bbone_easeout
Lucio Rossi
noreply at git.blender.org
Tue Dec 5 14:05:53 CET 2017
Commit: 1f2b515623706d95409bad0b21be27e4fa480454
Author: Lucio Rossi
Date: Tue Dec 5 14:05:23 2017 +0100
Branches: master
https://developer.blender.org/rBA1f2b515623706d95409bad0b21be27e4fa480454
fix T53356: update bbone_in bbone_out props to bbone_easein bbone_easeout
===================================================================
M rigify/generate.py
M rigify/legacy/generate.py
M rigify/legacy/rigs/biped/limb_common.py
M rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
M rigify/legacy/rigs/pitchipoy/super_finger.py
M rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
M rigify/legacy/utils.py
M rigify/rigs/experimental/super_chain.py
M rigify/rigs/limbs/arm.py
M rigify/rigs/limbs/leg.py
M rigify/rigs/limbs/paw.py
M rigify/rigs/limbs/super_finger.py
M rigify/rigs/spines/super_spine.py
M rigify/utils.py
===================================================================
diff --git a/rigify/generate.py b/rigify/generate.py
index 42523490..e2492708 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -179,8 +179,8 @@ def generate_rig(context, metarig):
# B-bone stuff
bone_gen.bbone_segments = bone.bbone_segments
- bone_gen.bbone_in = bone.bbone_in
- bone_gen.bbone_out = bone.bbone_out
+ bone_gen.bbone_easein = bone.bbone_easein
+ bone_gen.bbone_easeout = bone.bbone_easeout
# Copy over the pose_bone properties
for bone in metarig.pose.bones:
diff --git a/rigify/legacy/generate.py b/rigify/legacy/generate.py
index 0536377e..3bc9823b 100644
--- a/rigify/legacy/generate.py
+++ b/rigify/legacy/generate.py
@@ -142,8 +142,8 @@ def generate_rig(context, metarig):
# B-bone stuff
bone_gen.bbone_segments = bone.bbone_segments
- bone_gen.bbone_in = bone.bbone_in
- bone_gen.bbone_out = bone.bbone_out
+ bone_gen.bbone_easein = bone.bbone_easein
+ bone_gen.bbone_easeout = bone.bbone_easeout
# Copy over the pose_bone properties
for bone in metarig.pose.bones:
diff --git a/rigify/legacy/rigs/biped/limb_common.py b/rigify/legacy/rigs/biped/limb_common.py
index eadd6374..73e9ad34 100644
--- a/rigify/legacy/rigs/biped/limb_common.py
+++ b/rigify/legacy/rigs/biped/limb_common.py
@@ -1080,20 +1080,20 @@ class RubberHoseLimb:
# B-bone settings
ulimb2_p.bone.bbone_segments = 16
- ulimb2_p.bone.bbone_in = 0.0
- ulimb2_p.bone.bbone_out = 1.0
+ ulimb2_p.bone.bbone_easein = 0.0
+ ulimb2_p.bone.bbone_easeout = 1.0
ulimb2_smoother_p.bone.bbone_segments = 16
- ulimb2_smoother_p.bone.bbone_in = 1.0
- ulimb2_smoother_p.bone.bbone_out = 0.0
+ ulimb2_smoother_p.bone.bbone_easein = 1.0
+ ulimb2_smoother_p.bone.bbone_easeout = 0.0
flimb1_p.bone.bbone_segments = 16
- flimb1_p.bone.bbone_in = 1.0
- flimb1_p.bone.bbone_out = 0.0
+ flimb1_p.bone.bbone_easein = 1.0
+ flimb1_p.bone.bbone_easeout = 0.0
flimb1_smoother_p.bone.bbone_segments = 16
- flimb1_smoother_p.bone.bbone_in = 0.0
- flimb1_smoother_p.bone.bbone_out = 1.0
+ flimb1_smoother_p.bone.bbone_easein = 0.0
+ flimb1_smoother_p.bone.bbone_easeout = 1.0
# Custom properties
prop = rna_idprop_ui_prop_get(jhose_p, "smooth_bend", create=True)
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
index 6e173d10..c6f5329f 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
@@ -322,10 +322,10 @@ class Rig:
for bone in def_bones[:-1]:
self.obj.data.bones[bone].bbone_segments = self.bbones
- self.obj.data.bones[ def_bones[0] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-2] ].bbone_out = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_out = 0.0
+ self.obj.data.bones[ def_bones[0] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-2] ].bbone_easeout = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easeout = 0.0
# Rubber hose drivers
@@ -351,11 +351,11 @@ class Rig:
drvs = {}
if j != 0:
tidx = j
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_in").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easein").driver
if j != len( def_bones[:-1] ) - 1:
tidx = j + 1
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_out").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easeout").driver
for d in drvs:
drv = drvs[d]
diff --git a/rigify/legacy/rigs/pitchipoy/super_finger.py b/rigify/legacy/rigs/pitchipoy/super_finger.py
index 6a9c5f09..68b2c7fa 100644
--- a/rigify/legacy/rigs/pitchipoy/super_finger.py
+++ b/rigify/legacy/rigs/pitchipoy/super_finger.py
@@ -256,7 +256,7 @@ class Rig:
def_bone = self.obj.data.bones[deform]
def_bone.bbone_segments = 8
- drv = def_bone.driver_add("bbone_in").driver # Ease in
+ drv = def_bone.driver_add("bbone_easein").driver # Ease in
drv.type='SUM'
drv_var = drv.variables.new()
@@ -265,7 +265,7 @@ class Rig:
drv_var.targets[0].id = self.obj
drv_var.targets[0].data_path = pb_master.path_from_id() + '["finger_curve"]'
- drv = def_bone.driver_add("bbone_out").driver # Ease out
+ drv = def_bone.driver_add("bbone_easeout").driver # Ease out
drv.type='SUM'
drv_var = drv.variables.new()
diff --git a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
index b6b70085..a39d8471 100644
--- a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
+++ b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
@@ -558,8 +558,8 @@ class Rig:
for bone in bones['def'][:-1]:
self.obj.data.bones[bone].bbone_segments = 8
- self.obj.data.bones[ bones['def'][0] ].bbone_in = 0.0
- self.obj.data.bones[ bones['def'][-2] ].bbone_out = 0.0
+ self.obj.data.bones[ bones['def'][0] ].bbone_easein = 0.0
+ self.obj.data.bones[ bones['def'][-2] ].bbone_easeout = 0.0
# Locks
tweaks = bones['neck']['tweak'] + bones['chest']['tweak']
diff --git a/rigify/legacy/utils.py b/rigify/legacy/utils.py
index 65838b7d..cc2d6676 100644
--- a/rigify/legacy/utils.py
+++ b/rigify/legacy/utils.py
@@ -197,8 +197,8 @@ def copy_bone(obj, bone_name, assign_name=''):
edit_bone_2.use_deform = edit_bone_1.use_deform
edit_bone_2.bbone_segments = edit_bone_1.bbone_segments
- edit_bone_2.bbone_in = edit_bone_1.bbone_in
- edit_bone_2.bbone_out = edit_bone_1.bbone_out
+ edit_bone_2.bbone_easein = edit_bone_1.bbone_easein
+ edit_bone_2.bbone_easeout = edit_bone_1.bbone_easeout
bpy.ops.object.mode_set(mode='OBJECT')
diff --git a/rigify/rigs/experimental/super_chain.py b/rigify/rigs/experimental/super_chain.py
index 32c1b925..3282ec4d 100644
--- a/rigify/rigs/experimental/super_chain.py
+++ b/rigify/rigs/experimental/super_chain.py
@@ -228,11 +228,11 @@ class Rig:
self.obj.data.bones[bone].bbone_segments = self.bbones
if not self.SINGLE_BONE:
- self.obj.data.bones[def_bones[0]].bbone_in = 0.0
- self.obj.data.bones[def_bones[-1]].bbone_out = 0.0
+ self.obj.data.bones[def_bones[0]].bbone_easein = 0.0
+ self.obj.data.bones[def_bones[-1]].bbone_easeout = 0.0
else:
- self.obj.data.bones[def_bones[0]].bbone_in = 1.0
- self.obj.data.bones[def_bones[-1]].bbone_out = 1.0
+ self.obj.data.bones[def_bones[0]].bbone_easein = 1.0
+ self.obj.data.bones[def_bones[-1]].bbone_easeout = 1.0
bpy.ops.object.mode_set(mode='EDIT')
return def_bones
diff --git a/rigify/rigs/limbs/arm.py b/rigify/rigs/limbs/arm.py
index 193e2034..6ec087ac 100644
--- a/rigify/rigs/limbs/arm.py
+++ b/rigify/rigs/limbs/arm.py
@@ -328,10 +328,10 @@ class Rig:
for bone in def_bones[:-1]:
self.obj.data.bones[bone].bbone_segments = self.bbones
- self.obj.data.bones[ def_bones[0] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-2] ].bbone_out = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_out = 0.0
+ self.obj.data.bones[ def_bones[0] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-2] ].bbone_easeout = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easeout = 0.0
# Rubber hose drivers
@@ -357,11 +357,11 @@ class Rig:
drvs = {}
if j != 0:
tidx = j
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_in").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easein").driver
if j != len( def_bones[:-1] ) - 1:
tidx = j + 1
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_out").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easeout").driver
for d in drvs:
drv = drvs[d]
diff --git a/rigify/rigs/limbs/leg.py b/rigify/rigs/limbs/leg.py
index 6c76dd9f..c2414748 100644
--- a/rigify/rigs/limbs/leg.py
+++ b/rigify/rigs/limbs/leg.py
@@ -355,10 +355,10 @@ class Rig:
for bone in def_bones[:-1]:
self.obj.data.bones[bone].bbone_segments = self.bbones
- self.obj.data.bones[ def_bones[0] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-2] ].bbone_out = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_in = 0.0
- self.obj.data.bones[ def_bones[-1] ].bbone_out = 0.0
+ self.obj.data.bones[ def_bones[0] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-2] ].bbone_easeout = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easein = 0.0
+ self.obj.data.bones[ def_bones[-1] ].bbone_easeout = 0.0
# Rubber hose drivers
@@ -384,11 +384,11 @@ class Rig:
drvs = {}
if j != 0:
tidx = j
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_in").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easein").driver
if j != len( def_bones[:-1] ) - 1:
tidx = j + 1
- drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_out").driver
+ drvs[tidx] = self.obj.data.bones[d].driver_add("bbone_easeout").driver
for d in drvs:
drv = drvs[d]
diff --git a/rigify/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list