diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-10 14:14:11 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-10 14:14:11 +0300 |
commit | 46326b62b553f39e3d691ebf611eb3544d6b6f52 (patch) | |
tree | 13858c4b12713e7c5611f10fb5dcb07cbb26a8cd /source/blender/src/toets.c | |
parent | a534361b3e41886265fbad6d649f56d8ded021ec (diff) |
1) Fix for bugs #1735 #1759
Rotate edges was unfinished still, and not supposed to work on large
selections. Code cleaned up some, and restricted to work on a single
selected edge, or two adjacent selected faces.
Also changed menu description, and give error() on wrong selection.
2) Fix for undo mixup in texteditor
Global hotkey list now passes on ctrl+z (global undo) to local queue
in textwindow. (Also for ctrl+y). Scriptwindow also doesn't accept
global undo key.
Diffstat (limited to 'source/blender/src/toets.c')
-rw-r--r-- | source/blender/src/toets.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index a7ce1eb3362..dcef102e54c 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -987,16 +987,20 @@ int blenderqread(unsigned short event, short val) } break; case YKEY: // redo alternative - if(G.qual==LR_CTRLKEY) { - BIF_redo(); - return 0; + if(textspace==0) { + if(G.qual==LR_CTRLKEY) { + BIF_redo(); + return 0; + } } break; case ZKEY: // undo - if(G.qual & (LR_CTRLKEY|LR_COMMANDKEY)) { // all combos with ctrl/commandkey are accepted - if ELEM(G.qual, LR_CTRLKEY, LR_COMMANDKEY) BIF_undo(); - else BIF_redo(); // all combos with ctrl is redo - return 0; + if(textspace==0) { + if(G.qual & (LR_CTRLKEY|LR_COMMANDKEY)) { // all combos with ctrl/commandkey are accepted + if ELEM(G.qual, LR_CTRLKEY, LR_COMMANDKEY) BIF_undo(); + else BIF_redo(); // all combos with ctrl is redo + return 0; + } } break; } |