diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-05-25 17:37:43 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-05-25 17:37:43 +0300 |
| commit | 7a51eb53408a8561d03ada8d4b1a260b308f5b79 (patch) | |
| tree | f9dd32ead5318cc5684f1f49dc755ca4c86c828d /source/blender/blenkernel/intern/constraint.c | |
| parent | 1b06d5742e83270fe3a6c70df4629e68ce8ba908 (diff) | |
| parent | 219ce574b56585eb5db056983a8acf08f7ff9991 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -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 679fe703b13..56bc3db2762 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; |