diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2019-04-20 18:06:31 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2019-04-23 13:45:03 +0300 |
| commit | 624e93bbef8a8a34be822c1a98df131439c32788 (patch) | |
| tree | 592fce70ac6a810c6ee4ab9c0c3ce87ebedc14cf /source/blender/editors/armature/armature_utils.c | |
| parent | c043ab1cf3bce77248a8d7dfa42b2e9f8f9611aa (diff) | |
B-Bones: split the Scale In/Out properties into X and Y values.
As far as I can tell, there is no technical reason why the B-Bone
segment thickness scaling can't be separated into two axes. The
only downside is the increase in complexity of the B-Bone settings,
but this is inevitable due to the increase in flexibility.
Updating the file is somewhat complicated though, because F-Curves
and drivers have to be duplicated and updated to the new names.
Reviewers: campbellbarton
Subscribers: icappiello, jpbouza
Differential Revision: https://developer.blender.org/D4716
Diffstat (limited to 'source/blender/editors/armature/armature_utils.c')
| -rw-r--r-- | source/blender/editors/armature/armature_utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index b4e4396ce89..29e90ea672f 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -502,8 +502,10 @@ static EditBone *make_boneList_rec(ListBase *edbo, eBone->curveOutY = curBone->curveOutY; eBone->ease1 = curBone->ease1; eBone->ease2 = curBone->ease2; - eBone->scaleIn = curBone->scaleIn; - eBone->scaleOut = curBone->scaleOut; + eBone->scale_in_x = curBone->scale_in_x; + eBone->scale_in_y = curBone->scale_in_y; + eBone->scale_out_x = curBone->scale_out_x; + eBone->scale_out_y = curBone->scale_out_y; eBone->bbone_prev_type = curBone->bbone_prev_type; eBone->bbone_next_type = curBone->bbone_next_type; @@ -712,8 +714,10 @@ void ED_armature_from_edit(Main *bmain, bArmature *arm) newBone->curveOutY = eBone->curveOutY; newBone->ease1 = eBone->ease1; newBone->ease2 = eBone->ease2; - newBone->scaleIn = eBone->scaleIn; - newBone->scaleOut = eBone->scaleOut; + newBone->scale_in_x = eBone->scale_in_x; + newBone->scale_in_y = eBone->scale_in_y; + newBone->scale_out_x = eBone->scale_out_x; + newBone->scale_out_y = eBone->scale_out_y; newBone->bbone_prev_type = eBone->bbone_prev_type; newBone->bbone_next_type = eBone->bbone_next_type; |