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/transform | |
| parent | 996bf65730257d0a80c6ada03a38d0a321b1e87e (diff) | |
| parent | 81e584ed17902878579131776b4e5a9f7b54cdab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 02ad292e5c1..be5b475b89b 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1616,7 +1616,7 @@ static void drawArrow(ArrowDirection d, short offset, short length, short size) offset = -offset; length = -length; size = -size; - /* fall-through */ + ATTR_FALLTHROUGH; case RIGHT: immVertex2f(POS_INDEX, offset, 0); immVertex2f(POS_INDEX, offset + length, 0); @@ -1630,7 +1630,7 @@ static void drawArrow(ArrowDirection d, short offset, short length, short size) offset = -offset; length = -length; size = -size; - /* fall-through */ + ATTR_FALLTHROUGH; case UP: immVertex2f(POS_INDEX, 0, offset); immVertex2f(POS_INDEX, 0, offset + length); @@ -1651,7 +1651,7 @@ static void drawArrowHead(ArrowDirection d, short size) switch (d) { case LEFT: size = -size; - /* fall-through */ + ATTR_FALLTHROUGH; case RIGHT: immVertex2f(POS_INDEX, 0, 0); immVertex2f(POS_INDEX, -size, -size); @@ -1661,7 +1661,7 @@ static void drawArrowHead(ArrowDirection d, short size) case DOWN: size = -size; - /* fall-through */ + ATTR_FALLTHROUGH; case UP: immVertex2f(POS_INDEX, 0, 0); immVertex2f(POS_INDEX, -size, -size); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 024d465e29c..009cb2bac63 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -949,7 +949,7 @@ static int calc_manipulator_stats(const bContext *C) break; } /* if not gimbal, fall through to normal */ - /* fall-through */ + ATTR_FALLTHROUGH; } case V3D_MANIP_NORMAL: { @@ -960,7 +960,7 @@ static int calc_manipulator_stats(const bContext *C) break; } /* no break we define 'normal' as 'local' in Object mode */ - /* fall-through */ + ATTR_FALLTHROUGH; } case V3D_MANIP_LOCAL: { diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index e1a45cb2309..c9e40865164 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -455,14 +455,14 @@ void initTransformOrientation(bContext *C, TransInfo *t) BLI_strncpy(t->spacename, IFACE_("gimbal"), sizeof(t->spacename)); break; } - /* fall-through */ /* no gimbal fallthrough to normal */ + ATTR_FALLTHROUGH; /* no gimbal fallthrough to normal */ case V3D_MANIP_NORMAL: if (obedit || (ob && ob->mode & OB_MODE_POSE)) { BLI_strncpy(t->spacename, IFACE_("normal"), sizeof(t->spacename)); ED_getTransformOrientationMatrix(C, t->spacemtx, t->around); break; } - /* fall-through */ /* we define 'normal' as 'local' in Object mode */ + ATTR_FALLTHROUGH; /* we define 'normal' as 'local' in Object mode */ case V3D_MANIP_LOCAL: BLI_strncpy(t->spacename, IFACE_("local"), sizeof(t->spacename)); |