[Bf-blender-cvs] [5480de3fca8] master: Fix scale in Apply Pose As Rest Pose for bendy bones.
Alexander Gavrilov
noreply at git.blender.org
Sat Jul 7 14:13:13 CEST 2018
Commit: 5480de3fca8dc4841670e96cdf02759f6ad5e8d2
Author: Alexander Gavrilov
Date: Sat Jul 7 14:41:29 2018 +0300
Branches: master
https://developer.blender.org/rB5480de3fca8dc4841670e96cdf02759f6ad5e8d2
Fix scale in Apply Pose As Rest Pose for bendy bones.
Scale is multiplicative, and adding it up causes the bone to bloat.
===================================================================
M source/blender/editors/armature/pose_transform.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list