Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2018-07-07 14:41:29 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2018-07-07 15:10:41 +0300
commit5480de3fca8dc4841670e96cdf02759f6ad5e8d2 (patch)
tree0fab1ebb424875b1da2396c3c1a7a472efca003f
parent97cd8bfae19666554db17c42b3d2a7cfa16498f8 (diff)
Fix scale in Apply Pose As Rest Pose for bendy bones.
Scale is multiplicative, and adding it up causes the bone to bloat.
-rw-r--r--source/blender/editors/armature/pose_transform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 43dfa2f13d7..2d8f5dbecbe 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -164,8 +164,8 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
curbone->roll2 += pchan->roll2;
curbone->ease1 += pchan->ease1;
curbone->ease2 += pchan->ease2;
- curbone->scaleIn += pchan->scaleIn;
- curbone->scaleOut += pchan->scaleOut;
+ curbone->scaleIn *= pchan->scaleIn;
+ curbone->scaleOut *= pchan->scaleOut;
pchan->curveInX = pchan->curveOutX = 0.0f;
pchan->curveInY = pchan->curveOutY = 0.0f;