himisa/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

上传文件至 source/blender/blenkernel/intern #3

Merged
himisa merged 1 commits from himisa-patch-1 into main 2023-06-05 13:19:14 +02:00
Conversation 0 Commits 1 Files Changed 1 +10 -11
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1c6d89192 - Show all commits

19
source/blender/blenkernel/intern/armature_deform.c
View File

@ -63,24 +63,23 @@ static void pchan_deform_accumulate(const DualQuat *deform_dq,
if (dq_accum) {
BLI_assert(!co_accum);
/* FIX https://projects.blender.org/blender/blender/issues/32022 */
DualQuat mdq;
if (deform_dq->scale_weight) {
/* FIX https://projects.blender.org/blender/blender/issues/32022 */
DualQuat mdq = *deform_dq;
float dst[3];
memcpy(&mdq, deform_dq, sizeof(DualQuat));
mul_v3_m4v3(dst, mdq.scale, co_in);
sub_v3_v3(dst, co_in);
float w = mdq.quat[0], x = mdq.quat[1], y = mdq.quat[2], z = mdq.quat[3];
mdq.trans[0] -= .5f * (x * dst[0] + y * dst[1] + z * dst[2]);
mdq.trans[1] += .5f * (w * dst[0] + y * dst[2] - z * dst[1]);
mdq.trans[2] += .5f * (w * dst[1] + z * dst[0] - x * dst[2]);
mdq.trans[3] += .5f * (w * dst[2] + x * dst[1] - y * dst[0]);
mdq.trans[0] -= .5f * (mdq.quat[1] * dst[0] + mdq.quat[2] * dst[1] + mdq.quat[3] * dst[2]);
mdq.trans[1] += .5f * (mdq.quat[0] * dst[0] + mdq.quat[2] * dst[2] - mdq.quat[3] * dst[1]);
mdq.trans[2] += .5f * (mdq.quat[0] * dst[1] + mdq.quat[3] * dst[0] - mdq.quat[1] * dst[2]);
mdq.trans[3] += .5f * (mdq.quat[0] * dst[2] + mdq.quat[1] * dst[1] - mdq.quat[2] * dst[0]);
mdq.scale_weight = 0.f;
deform_dq = &mdq;
add_weighted_dq_dq(dq_accum, &mdq, weight);
}
else {
add_weighted_dq_dq(dq_accum, deform_dq, weight);
}
}
else {
float tmp[3];
mul_v3_m4v3(tmp, deform_mat, co_in);