diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-10-10 03:34:52 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-10-10 03:34:52 +0400 |
commit | f9bb4e3195d6b1c6be31306d83fe15d7b034a2cb (patch) | |
tree | bbfd4ffcaee46d471e70170def64acb233a1bb80 /source/blender/editors/mesh/loopcut.c | |
parent | fb561fb4c8849523ce11483f8f8d6a2c4f8aef36 (diff) |
* Added Grease Pencil Operator buttons to the Toolshelf
* Cancelling loopcuts with EscKey or RMB now works again.
Diffstat (limited to 'source/blender/editors/mesh/loopcut.c')
-rw-r--r-- | source/blender/editors/mesh/loopcut.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index e58025ac6ce..4ef25238a84 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -384,18 +384,28 @@ static int ringsel_modal (bContext *C, wmOperator *op, wmEvent *event) switch (event->type) { - case RIGHTMOUSE: case LEFTMOUSE: /* confirm */ // XXX hardcoded if (event->val == KM_RELEASE) { /* finish */ ED_region_tag_redraw(lcd->ar); - + ringsel_finish(C, op); ringsel_exit(C, op); return OPERATOR_FINISHED; } - + + ED_region_tag_redraw(lcd->ar); + break; + case RIGHTMOUSE: /* abort */ // XXX hardcoded + case ESCKEY: + if (event->val == KM_RELEASE) { + /* cancel */ + ED_region_tag_redraw(lcd->ar); + + return ringsel_cancel(C, op); + } + ED_region_tag_redraw(lcd->ar); break; case WHEELUPMOUSE: /* change number of cuts */ |