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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-29 13:52:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-29 13:52:38 +0300
commit4f997c0ebb734d5214fabb48059d50513ed570cf (patch)
tree54a573a8b062ddce532f3c216b85c89b63d8a997 /source
parentc007e3be720dd9ead90c049b1b2219ae65a9e453 (diff)
Revert "Transform: use scene-orientation for MMB axis constraint"
This reverts commit 78a6c2e12c8d144d10f759d05cbb3503f555883b.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/transform/transform.c11
1 files changed, 10 insertions, 1 deletions
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);
}
}