diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-20 07:19:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-20 07:19:05 +0300 |
| commit | 65aab6cdae822822122f5e180baf10e39f600bf2 (patch) | |
| tree | fc8556ec5590a0e47c41e2c18131fede4b67732b /source/blender/editors/space_clip | |
| parent | 996bf65730257d0a80c6ada03a38d0a321b1e87e (diff) | |
| parent | 81e584ed17902878579131776b4e5a9f7b54cdab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/space_clip.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops_plane.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index a142d40e7b9..eed2acbfc68 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -337,7 +337,7 @@ static void clip_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, con switch (wmn->data) { case ND_FRAME: clip_scopes_tag_refresh(sa); - /* fall-through */ + ATTR_FALLTHROUGH; case ND_FRAME_RANGE: ED_area_tag_redraw(sa); diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 169eb76399b..56c240c3d20 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -875,8 +875,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) if (ELEM(event->type, LEFTSHIFTKEY, RIGHTSHIFTKEY)) { data->accurate = event->val == KM_PRESS; } - - /* fall-through */ + ATTR_FALLTHROUGH; case MOUSEMOVE: mdelta[0] = event->mval[0] - data->mval[0]; mdelta[1] = event->mval[1] - data->mval[1]; diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 4332f3ea765..aa8518befaa 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -301,8 +301,7 @@ static int slide_plane_marker_modal(bContext *C, if (ELEM(event->type, LEFTSHIFTKEY, RIGHTSHIFTKEY)) { data->accurate = event->val == KM_PRESS; } - - /* fall-through */ + ATTR_FALLTHROUGH; case MOUSEMOVE: mdelta[0] = event->mval[0] - data->previous_mval[0]; mdelta[1] = event->mval[1] - data->previous_mval[1]; |