diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 16:34:54 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 16:46:08 +0300 |
| commit | 026eba8523ccaac5c46eb2ab94d857ba53d29994 (patch) | |
| tree | dbd94bc5a1ba7c97f876690c768222a788413eed /source | |
| parent | 849f5bee193e4d1c98b99a8e40da56a7af5a8fc8 (diff) | |
Fix T76941: "Set Inverse" in Child Of constraint broken with armatures
When the Child Of constraint is owned by a bone, before the constraint is
run the matrix is converted from world to pose space. However, setting the
inverse should also take the armature object's transform into account.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 099fdacf401..9a42d2f82f2 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -951,6 +951,10 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar /* If requested, compute the inverse matrix from the computed parent matrix. */ if (data->flag & CHILDOF_SET_INVERSE) { invert_m4_m4(data->invmat, parmat); + if (cob->pchan != NULL) { + mul_m4_series(data->invmat, data->invmat, cob->ob->obmat); + } + copy_m4_m4(inverse_matrix, data->invmat); data->flag &= ~CHILDOF_SET_INVERSE; |