diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-10 19:22:19 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-10 19:22:19 +0300 |
| commit | 278124669b9916e9254468169e9ff63fab94b661 (patch) | |
| tree | 077ec9185e578919dab1b7f4f07788388dbcd2eb /source/blender/editors | |
| parent | b8a3daea31335b75eb0548aeed5b3e94adee6f7c (diff) | |
bugfix #24573
View2d custom keymap to put zoom in RMB didn't work, the modal handler
still has a hardcoded check for mouse/keys. Fixed it for this case quickly,
added wiki todo and warning in code.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 5500d9aae8d..f59e7ddda4b 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1002,7 +1002,8 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) /* apply zooming */ view_zoomdrag_apply(C, op); - } else if (ELEM(event->type, LEFTMOUSE, MIDDLEMOUSE)) { + } + else if (ELEM3(event->type, LEFTMOUSE, MIDDLEMOUSE, RIGHTMOUSE)) { /* XXX needs modal keymap */ if (event->val==KM_RELEASE) { /* for redo, store the overall deltas - need to respect zoom-locks here... */ if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) |