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:
authorCampbell Barton <ideasman42@gmail.com>2019-02-21 09:51:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-21 09:52:13 +0300
commitf4d9e49f286fc50470fff51f04a1cf70b63b799f (patch)
treef06b27d3b0981439d92e5ca260a58b991d339981 /source/blender/editors/transform
parent941c03e2bf3b2369ae7ecd080460f1df8c941f14 (diff)
Fix redo regression w/ transform constraints
Adjusting a constrained transform would always use global space.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index aff565fd674..9a3bc10c40f 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2183,7 +2183,13 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
BLI_assert(orientation >= V3D_ORIENT_CUSTOM);
}
- RNA_float_set_array(op->ptr, "constraint_matrix", &t->spacemtx[0][0]);
+
+ if (t->con.mode & CON_APPLY) {
+ RNA_float_set_array(op->ptr, "constraint_matrix", &t->con.mtx[0][0]);
+ }
+ else {
+ RNA_float_set_array(op->ptr, "constraint_matrix", &t->spacemtx[0][0]);
+ }
/* Use 'constraint_matrix' instead. */
if (orientation != V3D_ORIENT_CUSTOM_MATRIX) {