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_nla | |
parent | 996bf65730257d0a80c6ada03a38d0a321b1e87e (diff) | |
parent | 81e584ed17902878579131776b4e5a9f7b54cdab (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index bb6a8676cc1..561c29b68cc 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -391,7 +391,7 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri /* draw the rect to the edge of the screen */ immRectf(shdr_pos, v2d->cur.xmin, yminc, strip->start, ymaxc); } - /* fall-through */ + ATTR_FALLTHROUGH; /* this only draws after the strip */ case NLASTRIP_EXTEND_HOLD_FORWARD: |