diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-03-09 12:44:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-03-09 12:44:55 +0300 |
| commit | f881162f81e57d3959b5e3bd917fbf0d6a4146c4 (patch) | |
| tree | 8ccb9a97958cd202d1d82d301cff424e3fca753c /source/blender/blenkernel/BKE_constraint.h | |
| parent | bc6bbe5fac864ded3a00f4a50d5eb79f89b74c75 (diff) | |
Revert "Constraints: remove special meaning of Local Space for parentless Objects."
This reverts commit 7728bfd4c45c634ba6b62e149176425ec5779945.
Although this brings back an inconsistency in the behaviour of
constraints on objects and bones, people were relying on the old
behaviour, and the new behaviour broke their files.
It is still desired to remove this inconsistency, but it will happen
more gradually.
Diffstat (limited to 'source/blender/blenkernel/BKE_constraint.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_constraint.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 73bd36844ac..8fe3bd77a26 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -191,8 +191,12 @@ struct bConstraintOb *BKE_constraints_make_evalob(struct Depsgraph *depsgraph, short datatype); void BKE_constraints_clear_evalob(struct bConstraintOb *cob); -void BKE_constraint_mat_convertspace( - struct Object *ob, struct bPoseChannel *pchan, float mat[4][4], short from, short to); +void BKE_constraint_mat_convertspace(struct Object *ob, + struct bPoseChannel *pchan, + float mat[4][4], + short from, + short to, + const bool keep_scale); void BKE_constraint_target_matrix_get(struct Depsgraph *depsgraph, struct Scene *scene, |