diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 11:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 11:10:19 +0300 |
| commit | 876cc5b7c04ceffb24acdb8d2abba0159429abac (patch) | |
| tree | 81db5f762e042098f160ca36e58a1bc99ee2f880 /source/blender/editors/animation | |
| parent | 2475dbdc94d8ebc53e7285e69c9900b7989f1e1c (diff) | |
| parent | 2174a2118b589b4b6805f901ffff2e29f5e32259 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index e563d3f8cf0..dfe7edde337 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -913,7 +913,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even 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); |