fix T53356: update bbone_in bbone_out props to bbone_easein bbone_easeout
This commit is contained in:
parent
1473e69bb8
commit
1f2b515623
Notes:
blender-bot
2023-02-14 19:33:15 +01:00
Referenced by issue #53356, Rigify generation broken on current master
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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']
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -347,10 +347,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
|
||||
|
@ -376,11 +376,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]
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -810,8 +810,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 = 1.0
|
||||
self.obj.data.bones[bones['def'][0]].bbone_easein = 0.0
|
||||
self.obj.data.bones[bones['def'][-2]].bbone_easeout = 1.0
|
||||
|
||||
# Locks
|
||||
tweaks = bones['neck']['tweak'] + bones['chest']['tweak']
|
||||
|
|
|
@ -275,8 +275,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')
|
||||
|
||||
|
|
Loading…
Reference in New Issue