diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 19:04:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 19:18:16 +0300 |
commit | d2db481dc70bba7b5ca2c3bf01e8748155fcefad (patch) | |
tree | c587f36b76c075bd3ecb4be48104fe1ce82d5e15 /source/blender/blenkernel/intern/CCGSubSurf_legacy.c | |
parent | a21cb22f8b12ea73937e7e6eda8465f1cba02b6e (diff) |
Cleanup: Blendkernel, Clang-Tidy else-after-return fixes (incomplete)
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenkernel` module. Not all warnings are
addressed in this commit.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/CCGSubSurf_legacy.c')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf_legacy.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c index f3f681baa01..8fc9afd58f1 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c @@ -38,9 +38,7 @@ static void *_edge_getCoVert(CCGEdge *e, CCGVert *v, int lvl, int x, int dataSiz if (v == e->v0) { return &EDGE_getLevelData(e)[dataSize * (levelBase + x)]; } - else { - return &EDGE_getLevelData(e)[dataSize * (levelBase + (1 << lvl) - x)]; - } + return &EDGE_getLevelData(e)[dataSize * (levelBase + (1 << lvl) - x)]; } /* *************************************************** */ @@ -65,9 +63,8 @@ static CCGVert *_edge_getOtherVert(CCGEdge *e, CCGVert *vQ) if (vQ == e->v0) { return e->v1; } - else { - return e->v0; - } + + return e->v0; } static float *_face_getIFNoEdge(CCGFace *f, @@ -111,15 +108,13 @@ static float EDGE_getSharpness(CCGEdge *e, int lvl) if (!lvl) { return e->crease; } - else if (!e->crease) { + if (!e->crease) { return 0.0f; } - else if (e->crease - lvl < 0.0f) { + if (e->crease - lvl < 0.0f) { return 0.0f; } - else { - return e->crease - lvl; - } + return e->crease - lvl; } typedef struct CCGSubSurfCalcSubdivData { |