[Bf-blender-cvs] [4f997c0ebb7] blender2.8: Revert "Transform: use scene-orientation for MMB axis constraint"

Campbell Barton noreply at git.blender.org
Thu Nov 29 11:55:43 CET 2018


Commit: 4f997c0ebb734d5214fabb48059d50513ed570cf
Author: Campbell Barton
Date:   Thu Nov 29 21:52:16 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB4f997c0ebb734d5214fabb48059d50513ed570cf

Revert "Transform: use scene-orientation for MMB axis constraint"

This reverts commit 78a6c2e12c8d144d10f759d05cbb3503f555883b.

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index b5abb2ba5c2..d05fc058184 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1373,7 +1373,16 @@ int transformEvent(TransInfo *t, const wmEvent *event)
 							stopConstraint(t);
 						}
 						else {
-							initSelectConstraint(t, t->spacemtx);
+							if (event->shift) {
+								initSelectConstraint(t, t->spacemtx);
+							}
+							else {
+								/* bit hackish... but it prevents mmb select to print the orientation from menu */
+								float mati[3][3];
+								strcpy(t->spacename, "global");
+								unit_m3(mati);
+								initSelectConstraint(t, mati);
+							}
 							postSelectConstraint(t);
 						}
 					}



More information about the Bf-blender-cvs mailing list