From 0e2302bfa563bed5e98e86a71c00b3d2861df0c3 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Sun, 24 Jul 2005 06:25:00 +0000 Subject: Big Transform Manipulator Merge *NOTE*: Some UI decision done in this commit will most likely be revised, all flame shall go in /dev/null. Constructive discussions of course welcomed. This commit merges manipulator orientation selection back in "traditional" transform. That's how it works: - The dropdown in the 3D view header is always visible - The orientation chosen will be used when choosing an axis with MMB and for the *second* key press of X,Y,Z However, Local orientation doesn't use the one calculated by the manipulator. This is to ensure that multiple object local and armatures in pose still works as before. - Alt-Space (to change the orientation) works during transform New Transform orientation: View, using the view axis. Fixes for the following bugs: - Constraint projection code "jammed" if input vector was <0,0,0>, reported a couple of times on IRC. Thanks to Basse for the example file. - Transform on texspace crashed on objects without texspace data (camera, lamp, ...). This was reported in tracker. - Numinput with lock constraints didn't work correctly. Reported on elysiun Probably some others that I'm forgetting I also moved a couple of functions around in an attempt to make things clearer. --- source/blender/src/space.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source/blender/src/space.c') diff --git a/source/blender/src/space.c b/source/blender/src/space.c index a690a6e3d16..895a292bffa 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1072,14 +1072,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } } else if(G.qual == LR_ALTKEY) { - val= pupmenu("Manipulator Orientation%t|Global|Local|Normal"); - if(val>0) { - if(val==1) v3d->twmode= V3D_MANIP_GLOBAL; - else if(val==2) v3d->twmode= V3D_MANIP_LOCAL; - else if(val==3) v3d->twmode= V3D_MANIP_NORMAL; - v3d->twflag |= V3D_USE_MANIPULATOR; - doredraw= 1; - } + BIF_selectOrientation(); + doredraw= 1; } break; -- cgit v1.2.3