[Bf-blender-cvs] [f4d9e49f286] master: Fix redo regression w/ transform constraints

Campbell Barton noreply at git.blender.org
Thu Feb 21 07:52:58 CET 2019


Commit: f4d9e49f286fc50470fff51f04a1cf70b63b799f
Author: Campbell Barton
Date:   Thu Feb 21 17:51:02 2019 +1100
Branches: master
https://developer.blender.org/rBf4d9e49f286fc50470fff51f04a1cf70b63b799f

Fix redo regression w/ transform constraints

Adjusting a constrained transform would always use global space.

===================================================================

M	source/blender/editors/transform/transform.c

===================================================================

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) {



More information about the Bf-blender-cvs mailing list