Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-07-03 15:51:19 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-07-03 17:15:00 +0300
commitf82e52ebc838b666c258090236f0323d0d4f6aee (patch)
treec3980e3b94e1ff6066a0389d11fe8dee4b5455d6 /source/blender/editors/animation/anim_markers.c
parent17ba5660182b59c8c2f0b5afc2f73e91b5ffe151 (diff)
Cleanup: Editors/Animation, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/animation` module. No functional changes.
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
-rw-r--r--source/blender/editors/animation/anim_markers.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 46566feea91..d823b976a47 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -110,9 +110,7 @@ ListBase *ED_animcontext_get_markers(const bAnimContext *ac)
if (ac) {
return context_get_markers(ac->scene, ac->area);
}
- else {
- return NULL;
- }
+ return NULL;
}
/* --------------------------------- */
@@ -307,7 +305,7 @@ static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only
}
return;
}
- else if (ce->cfra > marker->frame) {
+ if (ce->cfra > marker->frame) {
break;
}
}
@@ -487,13 +485,11 @@ static int marker_get_icon_id(TimeMarker *marker, int flag)
(marker->flag & SELECT) ? ICON_PMARKER_SEL : ICON_PMARKER;
}
#ifdef DURIAN_CAMERA_SWITCH
- else if (marker->camera) {
+ if (marker->camera) {
return (marker->flag & SELECT) ? ICON_OUTLINER_OB_CAMERA : ICON_CAMERA_DATA;
}
#endif
- else {
- return (marker->flag & SELECT) ? ICON_MARKER_HLT : ICON_MARKER;
- }
+ return (marker->flag & SELECT) ? ICON_MARKER_HLT : ICON_MARKER;
}
static void draw_marker(
@@ -1508,9 +1504,8 @@ static int ed_marker_rename_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
- else {
- return OPERATOR_CANCELLED;
- }
+
+ return OPERATOR_CANCELLED;
}
static int ed_marker_rename_invoke(bContext *C, wmOperator *op, const wmEvent *event)