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/pose_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/pose_utils.c')
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index 2b7bd9ea05a..4215c122917 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -121,8 +121,10 @@ static void fcurves_to_pchan_links_get(ListBase *pfLinks, pfl->curveOutY = pchan->curveOutY; pfl->ease1 = pchan->ease1; pfl->ease2 = pchan->ease2; - pfl->scaleIn = pchan->scaleIn; - pfl->scaleOut = pchan->scaleOut; + pfl->scale_in_x = pchan->scale_in_x; + pfl->scale_in_y = pchan->scale_in_y; + pfl->scale_out_x = pchan->scale_out_x; + pfl->scale_out_y = pchan->scale_out_y; /* make copy of custom properties */ if (pchan->prop && (transFlags & ACT_TRANS_PROP)) { @@ -265,8 +267,10 @@ void poseAnim_mapping_reset(ListBase *pfLinks) pchan->curveOutY = pfl->curveOutY; pchan->ease1 = pfl->ease1; pchan->ease2 = pfl->ease2; - pchan->scaleIn = pfl->scaleIn; - pchan->scaleOut = pfl->scaleOut; + pchan->scale_in_x = pfl->scale_in_x; + pchan->scale_in_y = pfl->scale_in_y; + pchan->scale_out_x = pfl->scale_out_x; + pchan->scale_out_y = pfl->scale_out_y; /* just overwrite values of properties from the stored copies (there should be some) */ if (pfl->oldprops) { |