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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-10-17 17:20:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-10-17 17:20:28 +0300
commit9378d46c4d33fbd71194170fa86f1ff3021ec973 (patch)
treece1708b11d3c3dbb53018d524bbaf3d1af767cd5
parent77e38160fe2a351f0b9b81d0e18c4dfe5df1d3ad (diff)
parentade2129f14dbc7a7e60b9fcde7381a5ab53b0035 (diff)
Merge branch 'blender-v2.81-release'
-rw-r--r--source/blender/blenkernel/intern/armature_update.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 7c68c8319a5..e30accf6279 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -740,7 +740,12 @@ static void pose_channel_flush_to_orig_if_needed(struct Depsgraph *depsgraph,
return;
}
bPoseChannel *pchan_orig = pchan->orig_pchan;
- BKE_pose_copy_pchan_result(pchan_orig, pchan);
+ /* TODO(sergey): Using BKE_pose_copy_pchan_result() introduces T70901, but why? */
+ copy_m4_m4(pchan_orig->pose_mat, pchan->pose_mat);
+ copy_m4_m4(pchan_orig->chan_mat, pchan->chan_mat);
+ copy_v3_v3(pchan_orig->pose_head, pchan->pose_mat[3]);
+ copy_m4_m4(pchan_orig->constinv, pchan->constinv);
+ copy_v3_v3(pchan_orig->pose_tail, pchan->pose_tail);
}
void BKE_pose_bone_done(struct Depsgraph *depsgraph, struct Object *object, int pchan_index)