Toying a bit with MMB behavior:

MMB click with no constraint selects a constraint right away (the axis selector doesn't flash on screen)
MMB click with a constraint removes the constraint
MMB click-drag in both case (with and without a constraint) uses the axis selector.

stopConstraint didn't remove the CON_SELECT flag, so cancelling transform while selecting a constraint and then reentering transform was funny. Fixed

1 files changed, 3 insertions, 4 deletions

diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c
index 6908e6c8f96..7611041cddd 100755
--- a/source/blender/src/transform_constraints.c
+++ b/source/blender/src/transform_constraints.c
@@ -718,7 +718,7 @@ void startConstraint(TransInfo *t) {
 }
 
 void stopConstraint(TransInfo *t) {
-	t->con.mode &= ~CON_APPLY;
+	t->con.mode &= ~(CON_APPLY|CON_SELECT);
 	*t->con.text = '\0';
 	t->num.idx_max = t->idx_max;
 }
@@ -751,10 +751,9 @@ void getConstraintMatrix(TransInfo *t)
 	Mat3MulMat3(t->con.pmtx, t->con.mtx, mat);
 }
 
-void initSelectConstraint(TransInfo *t)
+void initSelectConstraint(TransInfo *t, float mtx[3][3])
 {
-	Mat3One(t->con.mtx);
-	Mat3One(t->con.pmtx);
+	Mat3CpyMat3(t->con.mtx, mtx);
 	t->con.mode |= CON_APPLY;
 	t->con.mode |= CON_SELECT;