From 312c8d146c6774c1fe3ca719adde455cc796e9cc Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Fri, 1 Apr 2005 18:39:39 +0000 Subject: Removed casting warnings from transform_manipulator. PET is now checked as a transform flag during transform. Much cleaner that way for NOPET context (extrude, duplicate) Added Sphere as a new PET falloff mode (icon and all) and reordered them around in a more logical fashion (IMHO). Also brought back Subsurf toggle with Shift-O (was supposed to be for PET object mode but that was canned). --- source/blender/src/space.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'source/blender/src/space.c') diff --git a/source/blender/src/space.c b/source/blender/src/space.c index fd936da8eaf..0556aa7306a 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1425,16 +1425,18 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case OKEY: ob= OBACT; - if (G.qual==LR_SHIFTKEY) { - extern int prop_mode; - prop_mode = (prop_mode+1)%5; - allqueue(REDRAWHEADERS, 0); - } - else if((G.qual==0)) { - G.f ^= G_PROPORTIONAL; - allqueue(REDRAWHEADERS, 0); + if (G.obedit) { + if (G.qual==LR_SHIFTKEY) { + extern int prop_mode; + prop_mode = (prop_mode+1)%6; + allqueue(REDRAWHEADERS, 0); + } + else if((G.qual==0)) { + G.f ^= G_PROPORTIONAL; + allqueue(REDRAWHEADERS, 0); + } } - else if((G.qual==LR_CTRLKEY)) { + else if((G.qual==LR_SHIFTKEY)) { if(ob && ob->type == OB_MESH) { flip_subdivison(ob, -1); } -- cgit v1.2.3