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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/src/space.c')
-rw-r--r--source/blender/src/space.c20
1 files changed, 11 insertions, 9 deletions
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);
}