diff options
| author | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
|---|---|---|
| committer | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
| commit | 59908f5eb73670c97c5bb817290a0dac99089900 (patch) | |
| tree | 709de097c1fac2ff7b172a8b50dc8a91d7b74860 /source/blender/editors/animation/anim_markers.c | |
| parent | 595f2ca2e06e07acaccc473982bde7a5ed644b50 (diff) | |
| parent | edc6bec9d60204cb81d2e7533402630b076d0d32 (diff) | |
Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusiongsoc2016-improved_extrusion
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 823cde75334..be01f8cbe69 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -888,13 +888,14 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even ed_marker_move_cancel(C, op); return OPERATOR_CANCELLED; } - /* else continue; <--- see if release event should be caught for tweak-end */ + /* else continue; <--- see if release event should be caught for tweak-end */ + ATTR_FALLTHROUGH; case RETKEY: case PADENTER: case LEFTMOUSE: case MIDDLEMOUSE: - if (WM_modal_tweak_exit(event, mm->event_type)) { + if (WM_event_is_modal_tweak_exit(event, mm->event_type)) { ed_marker_move_exit(C, op); WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL); WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL); |