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.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.c')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 179 |
1 files changed, 71 insertions, 108 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index 98deddb4316..e035d5cbb68 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -177,9 +177,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)]; } static void _edge_free(CCGEdge *e, CCGSubSurf *ss) @@ -260,46 +258,45 @@ CCGSubSurf *ccgSubSurf_new(CCGMeshIFC *ifc, if (subdivLevels < 1) { return NULL; } - else { - CCGSubSurf *ss = allocatorIFC->alloc(allocator, sizeof(*ss)); - ss->allocatorIFC = *allocatorIFC; - ss->allocator = allocator; + CCGSubSurf *ss = allocatorIFC->alloc(allocator, sizeof(*ss)); - ss->vMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); - ss->eMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); - ss->fMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); + ss->allocatorIFC = *allocatorIFC; + ss->allocator = allocator; - ss->meshIFC = *ifc; + ss->vMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); + ss->eMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); + ss->fMap = ccg_ehash_new(0, &ss->allocatorIFC, ss->allocator); - ss->subdivLevels = subdivLevels; - ss->numGrids = 0; - ss->allowEdgeCreation = 0; - ss->defaultCreaseValue = 0; - ss->defaultEdgeUserData = NULL; + ss->meshIFC = *ifc; - ss->useAgeCounts = 0; - ss->vertUserAgeOffset = ss->edgeUserAgeOffset = ss->faceUserAgeOffset = 0; + ss->subdivLevels = subdivLevels; + ss->numGrids = 0; + ss->allowEdgeCreation = 0; + ss->defaultCreaseValue = 0; + ss->defaultEdgeUserData = NULL; - ss->calcVertNormals = 0; - ss->normalDataOffset = 0; + ss->useAgeCounts = 0; + ss->vertUserAgeOffset = ss->edgeUserAgeOffset = ss->faceUserAgeOffset = 0; - ss->allocMask = 0; + ss->calcVertNormals = 0; + ss->normalDataOffset = 0; - ss->q = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize); - ss->r = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize); + ss->allocMask = 0; - ss->currentAge = 0; + ss->q = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize); + ss->r = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize); - ss->syncState = eSyncState_None; + ss->currentAge = 0; - ss->oldVMap = ss->oldEMap = ss->oldFMap = NULL; - ss->lenTempArrays = 0; - ss->tempVerts = NULL; - ss->tempEdges = NULL; + ss->syncState = eSyncState_None; - return ss; - } + ss->oldVMap = ss->oldEMap = ss->oldFMap = NULL; + ss->lenTempArrays = 0; + ss->tempVerts = NULL; + ss->tempEdges = NULL; + + return ss; } void ccgSubSurf_free(CCGSubSurf *ss) @@ -378,7 +375,7 @@ CCGError ccgSubSurf_setSubdivisionLevels(CCGSubSurf *ss, int subdivisionLevels) if (subdivisionLevels <= 0) { return eCCGError_InvalidValue; } - else if (subdivisionLevels != ss->subdivLevels) { + if (subdivisionLevels != ss->subdivLevels) { ss->numGrids = 0; ss->subdivLevels = subdivisionLevels; ccg_ehash_free(ss->vMap, (EHEntryFreeFP)_vert_free, ss); @@ -420,12 +417,10 @@ CCGError ccgSubSurf_setUseAgeCounts( (faceUserOffset + 4 > ss->meshIFC.faceUserSize)) { return eCCGError_InvalidValue; } - else { - ss->useAgeCounts = 1; - ss->vertUserAgeOffset = vertUserOffset; - ss->edgeUserAgeOffset = edgeUserOffset; - ss->faceUserAgeOffset = faceUserOffset; - } + ss->useAgeCounts = 1; + ss->vertUserAgeOffset = vertUserOffset; + ss->edgeUserAgeOffset = edgeUserOffset; + ss->faceUserAgeOffset = faceUserOffset; } else { ss->useAgeCounts = 0; @@ -441,10 +436,8 @@ CCGError ccgSubSurf_setCalcVertexNormals(CCGSubSurf *ss, int useVertNormals, int if (normalDataOffset < 0 || normalDataOffset + 12 > ss->meshIFC.vertDataSize) { return eCCGError_InvalidValue; } - else { - ss->calcVertNormals = 1; - ss->normalDataOffset = normalDataOffset; - } + ss->calcVertNormals = 1; + ss->normalDataOffset = normalDataOffset; } else { ss->calcVertNormals = 0; @@ -512,19 +505,17 @@ CCGError ccgSubSurf_syncVertDel(CCGSubSurf *ss, CCGVertHDL vHDL) if (ss->syncState != eSyncState_Partial) { return eCCGError_InvalidSyncState; } - else { - void **prevp; - CCGVert *v = ccg_ehash_lookupWithPrev(ss->vMap, vHDL, &prevp); - if (!v || v->numFaces || v->numEdges) { - return eCCGError_InvalidValue; - } - else { - *prevp = v->next; - _vert_free(v, ss); - } + void **prevp; + CCGVert *v = ccg_ehash_lookupWithPrev(ss->vMap, vHDL, &prevp); + + if (!v || v->numFaces || v->numEdges) { + return eCCGError_InvalidValue; } + *prevp = v->next; + _vert_free(v, ss); + return eCCGError_None; } @@ -533,19 +524,17 @@ CCGError ccgSubSurf_syncEdgeDel(CCGSubSurf *ss, CCGEdgeHDL eHDL) if (ss->syncState != eSyncState_Partial) { return eCCGError_InvalidSyncState; } - else { - void **prevp; - CCGEdge *e = ccg_ehash_lookupWithPrev(ss->eMap, eHDL, &prevp); - if (!e || e->numFaces) { - return eCCGError_InvalidValue; - } - else { - *prevp = e->next; - _edge_unlinkMarkAndFree(e, ss); - } + void **prevp; + CCGEdge *e = ccg_ehash_lookupWithPrev(ss->eMap, eHDL, &prevp); + + if (!e || e->numFaces) { + return eCCGError_InvalidValue; } + *prevp = e->next; + _edge_unlinkMarkAndFree(e, ss); + return eCCGError_None; } @@ -554,19 +543,17 @@ CCGError ccgSubSurf_syncFaceDel(CCGSubSurf *ss, CCGFaceHDL fHDL) if (ss->syncState != eSyncState_Partial) { return eCCGError_InvalidSyncState; } - else { - void **prevp; - CCGFace *f = ccg_ehash_lookupWithPrev(ss->fMap, fHDL, &prevp); - if (!f) { - return eCCGError_InvalidValue; - } - else { - *prevp = f->next; - _face_unlinkMarkAndFree(f, ss); - } + void **prevp; + CCGFace *f = ccg_ehash_lookupWithPrev(ss->fMap, fHDL, &prevp); + + if (!f) { + return eCCGError_InvalidValue; } + *prevp = f->next; + _face_unlinkMarkAndFree(f, ss); + return eCCGError_None; } @@ -1264,9 +1251,7 @@ int ccgSubSurf_getEdgeLevelSize(const CCGSubSurf *ss, int level) if (level < 1 || level > ss->subdivLevels) { return -1; } - else { - return ccg_edgesize(level); - } + return ccg_edgesize(level); } int ccgSubSurf_getGridSize(const CCGSubSurf *ss) { @@ -1277,9 +1262,7 @@ int ccgSubSurf_getGridLevelSize(const CCGSubSurf *ss, int level) if (level < 1 || level > ss->subdivLevels) { return -1; } - else { - return ccg_gridsize(level); - } + return ccg_gridsize(level); } int ccgSubSurf_getSimpleSubdiv(const CCGSubSurf *ss) @@ -1299,9 +1282,7 @@ int ccgSubSurf_getVertAge(CCGSubSurf *ss, CCGVert *v) byte *userData = ccgSubSurf_getVertUserData(ss, v); return ss->currentAge - *((int *)&userData[ss->vertUserAgeOffset]); } - else { - return 0; - } + return 0; } void *ccgSubSurf_getVertUserData(CCGSubSurf *ss, CCGVert *v) { @@ -1316,9 +1297,7 @@ CCGFace *ccgSubSurf_getVertFace(CCGVert *v, int index) if (index < 0 || index >= v->numFaces) { return NULL; } - else { - return v->faces[index]; - } + return v->faces[index]; } int ccgSubSurf_getVertNumEdges(CCGVert *v) { @@ -1329,9 +1308,7 @@ CCGEdge *ccgSubSurf_getVertEdge(CCGVert *v, int index) if (index < 0 || index >= v->numEdges) { return NULL; } - else { - return v->edges[index]; - } + return v->edges[index]; } void *ccgSubSurf_getVertData(CCGSubSurf *ss, CCGVert *v) { @@ -1342,9 +1319,7 @@ void *ccgSubSurf_getVertLevelData(CCGSubSurf *ss, CCGVert *v, int level) if (level < 0 || level > ss->subdivLevels) { return NULL; } - else { - return ccg_vert_getCo(v, level, ss->meshIFC.vertDataSize); - } + return ccg_vert_getCo(v, level, ss->meshIFC.vertDataSize); } /* Edge accessors */ @@ -1359,9 +1334,7 @@ int ccgSubSurf_getEdgeAge(CCGSubSurf *ss, CCGEdge *e) byte *userData = ccgSubSurf_getEdgeUserData(ss, e); return ss->currentAge - *((int *)&userData[ss->edgeUserAgeOffset]); } - else { - return 0; - } + return 0; } void *ccgSubSurf_getEdgeUserData(CCGSubSurf *ss, CCGEdge *e) { @@ -1376,9 +1349,7 @@ CCGFace *ccgSubSurf_getEdgeFace(CCGEdge *e, int index) if (index < 0 || index >= e->numFaces) { return NULL; } - else { - return e->faces[index]; - } + return e->faces[index]; } CCGVert *ccgSubSurf_getEdgeVert0(CCGEdge *e) { @@ -1401,9 +1372,7 @@ void *ccgSubSurf_getEdgeLevelData(CCGSubSurf *ss, CCGEdge *e, int x, int level) if (level < 0 || level > ss->subdivLevels) { return NULL; } - else { - return ccg_edge_getCo(e, level, x, ss->meshIFC.vertDataSize); - } + return ccg_edge_getCo(e, level, x, ss->meshIFC.vertDataSize); } float ccgSubSurf_getEdgeCrease(CCGEdge *e) { @@ -1422,9 +1391,7 @@ int ccgSubSurf_getFaceAge(CCGSubSurf *ss, CCGFace *f) byte *userData = ccgSubSurf_getFaceUserData(ss, f); return ss->currentAge - *((int *)&userData[ss->faceUserAgeOffset]); } - else { - return 0; - } + return 0; } void *ccgSubSurf_getFaceUserData(CCGSubSurf *ss, CCGFace *f) { @@ -1442,18 +1409,14 @@ CCGVert *ccgSubSurf_getFaceVert(CCGFace *f, int index) if (index < 0 || index >= f->numVerts) { return NULL; } - else { - return FACE_getVerts(f)[index]; - } + return FACE_getVerts(f)[index]; } CCGEdge *ccgSubSurf_getFaceEdge(CCGFace *f, int index) { if (index < 0 || index >= f->numVerts) { return NULL; } - else { - return FACE_getEdges(f)[index]; - } + return FACE_getEdges(f)[index]; } int ccgSubSurf_getFaceEdgeIndex(CCGFace *f, CCGEdge *e) { |