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
path: root/source/blender/blenkernel/intern/mesh_validate.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_validate.c')
-rw-r--r--source/blender/blenkernel/intern/mesh_validate.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index 7b56784b1dd..848483d2877 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -73,7 +73,7 @@ typedef struct SortPoly {
int numverts;
int loopstart;
unsigned int index;
- int invalid; /* Poly index. */
+ bool invalid; /* Poly index. */
} SortPoly;
static void edge_store_assign(uint32_t verts[2], const uint32_t v1, const uint32_t v2)
@@ -256,7 +256,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
for (i = 1; i < totvert; i++, mv++) {
- int fix_normal = TRUE;
+ bool fix_normal = true;
for (j = 0; j < 3; j++) {
if (!finite(mv->co[j])) {
@@ -265,25 +265,25 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (do_fixes) {
zero_v3(mv->co);
- verts_fixed = TRUE;
+ verts_fixed = true;
}
}
if (mv->no[j] != 0)
- fix_normal = FALSE;
+ fix_normal = false;
}
if (fix_normal) {
PRINT_ERR("\tVertex %u: has zero normal, assuming Z-up normal\n", i);
if (do_fixes) {
mv->no[2] = SHRT_MAX;
- verts_fixed = TRUE;
+ verts_fixed = true;
}
}
}
for (i = 0, me = medges; i < totedge; i++, me++) {
- int remove = FALSE;
+ int remove = false;
if (me->v1 == me->v2) {
PRINT_ERR("\tEdge %u: has matching verts, both %u\n", i, me->v1);
remove = do_fixes;
@@ -303,7 +303,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
remove = do_fixes;
}
- if (remove == FALSE) {
+ if (remove == false) {
BLI_edgehash_insert(edge_hash, me->v1, me->v2, SET_INT_IN_POINTER(i));
}
else {
@@ -312,7 +312,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
if (mfaces && !mpolys) {
-# define REMOVE_FACE_TAG(_mf) { _mf->v3 = 0; do_face_free = TRUE; } (void)0
+# define REMOVE_FACE_TAG(_mf) { _mf->v3 = 0; do_face_free = true; } (void)0
# define CHECK_FACE_VERT_INDEX(a, b) \
if (mf->a == mf->b) { \
PRINT_ERR(" face %u: verts invalid, " STRINGIFY(a) "/" STRINGIFY(b) " both %u\n", i, mf->a); \
@@ -322,7 +322,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (!BLI_edgehash_haskey(edge_hash, mf->a, mf->b)) { \
PRINT_ERR(" face %u: edge " STRINGIFY(a) "/" STRINGIFY(b) \
" (%u,%u) is missing edge data\n", i, mf->a, mf->b); \
- do_edge_recalc = TRUE; \
+ do_edge_recalc = true; \
} (void)0
MFace *mf;
@@ -336,7 +336,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
PRINT_ERR("No Polys, only tesselated Faces\n");
for (i = 0, mf = mfaces, sf = sort_faces; i < totface; i++, mf++) {
- int remove = FALSE;
+ int remove = false;
int fidx;
unsigned int fv[4];
@@ -349,7 +349,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
} while (fidx--);
- if (remove == FALSE) {
+ if (remove == false) {
if (mf->v4) {
CHECK_FACE_VERT_INDEX(v1, v2);
CHECK_FACE_VERT_INDEX(v1, v3);
@@ -367,7 +367,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
CHECK_FACE_VERT_INDEX(v2, v3);
}
- if (remove == FALSE) {
+ if (remove == false) {
if (totedge) {
if (mf->v4) {
CHECK_FACE_EDGE(v1, v2);
@@ -411,7 +411,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
sf++;
for (i = 1; i < totsortface; i++, sf++) {
- int remove = FALSE;
+ int remove = false;
/* on a valid mesh, code below will never run */
if (memcmp(sf->es, sf_prev->es, sizeof(sf_prev->es)) == 0) {
@@ -475,18 +475,18 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
/* Invalid loop data. */
PRINT_ERR("\tPoly %u is invalid (loopstart: %u, totloop: %u)\n",
sp->index, mp->loopstart, mp->totloop);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
else if (mp->loopstart + mp->totloop > totloop) {
/* Invalid loop data. */
PRINT_ERR("\tPoly %u uses loops out of range (loopstart: %u, loopend: %u, max nbr of loops: %u)\n",
sp->index, mp->loopstart, mp->loopstart + mp->totloop - 1, totloop - 1);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
else {
/* Poly itself is valid, for now. */
int v1, v2; /* v1 is prev loop vert idx, v2 is current loop one. */
- sp->invalid = FALSE;
+ sp->invalid = false;
sp->verts = v = MEM_mallocN(sizeof(int) * mp->totloop, "Vert idx of SortPoly");
sp->numverts = mp->totloop;
sp->loopstart = mp->loopstart;
@@ -496,7 +496,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (ml->v >= totvert) {
/* Invalid vert idx. */
PRINT_ERR("\tLoop %u has invalid vert reference (%u)\n", sp->loopstart + j, ml->v);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
mverts[ml->v].flag |= ME_VERT_TMP_TAG;
@@ -509,7 +509,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
for (j = 0; j < mp->totloop; j++, v++) {
if ((mverts[*v].flag & ME_VERT_TMP_TAG) == 0) {
PRINT_ERR("\tPoly %u has duplicate vert reference at corner (%u)\n", i, j);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
mverts[*v].flag &= ~ME_VERT_TMP_TAG;
}
@@ -526,9 +526,9 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
/* Edge not existing. */
PRINT_ERR("\tPoly %u needs missing edge (%u, %u)\n", sp->index, v1, v2);
if (do_fixes)
- do_edge_recalc = TRUE;
+ do_edge_recalc = true;
else
- sp->invalid = TRUE;
+ sp->invalid = true;
}
else if (ml->e >= totedge) {
/* Invalid edge idx.
@@ -541,7 +541,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
else {
PRINT_ERR("\tLoop %u has invalid edge reference (%u)\n", sp->loopstart + j, ml->e);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
}
else {
@@ -557,7 +557,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
else {
PRINT_ERR("\tPoly %u has invalid edge reference (%u)\n", sp->index, ml->e);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
}
}
@@ -576,7 +576,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (dlt > 1) {
PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %u (%u times)\n",
sp->index, *prev_v, dlt);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
prev_v = v;
}
@@ -584,7 +584,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (v - prev_v > 1) { /* Don't forget final verts! */
PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %u (%u times)\n",
sp->index, *prev_v, (int)(v - prev_v));
- sp->invalid = TRUE;
+ sp->invalid = true;
}
}
@@ -599,7 +599,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
for (i = 1; i < totpoly; i++, sp++) {
int p1_nv = sp->numverts, p2_nv = prev_sp->numverts;
int *p1_v = sp->verts, *p2_v = prev_sp->verts;
- short p1_sub = TRUE, p2_sub = TRUE;
+ short p1_sub = true, p2_sub = true;
if (sp->invalid)
break;
/* Test same polys. */
@@ -616,13 +616,13 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
while ((p1_nv && p2_nv) && (p1_sub || p2_sub)) {
if (*p1_v < *p2_v) {
if (p1_sub)
- p1_sub = FALSE;
+ p1_sub = false;
p1_nv--;
p1_v++;
}
else if (*p2_v < *p1_v) {
if (p2_sub)
- p2_sub = FALSE;
+ p2_sub = false;
p2_nv--;
p2_v++;
}
@@ -635,23 +635,23 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
}
}
if (p1_nv && p1_sub)
- p1_sub = FALSE;
+ p1_sub = false;
else if (p2_nv && p2_sub)
- p2_sub = FALSE;
+ p2_sub = false;
if (p1_sub && p2_sub) {
PRINT("\tPolys %u and %u use same vertices, considering poly %u as invalid.\n",
prev_sp->index, sp->index, sp->index);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
/* XXX In fact, these might be valid? :/ */
else if (p1_sub) {
PRINT("\t%u is a sub-poly of %u, considering it as invalid.\n", sp->index, prev_sp->index);
- sp->invalid = TRUE;
+ sp->invalid = true;
}
else if (p2_sub) {
PRINT("\t%u is a sub-poly of %u, considering it as invalid.\n", prev_sp->index, sp->index);
- prev_sp->invalid = TRUE;
+ prev_sp->invalid = true;
prev_sp = sp; /* sp is new reference poly. */
}
#else
@@ -670,7 +670,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
else {
is_valid = false;
}
- sp->invalid = TRUE;
+ sp->invalid = true;
}
#endif
else {
@@ -755,14 +755,14 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
PRINT_ERR("\tVertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
dw->weight = 0.0f;
- vert_weights_fixed = TRUE;
+ vert_weights_fixed = true;
}
}
else if (dw->weight < 0.0f || dw->weight > 1.0f) {
PRINT_ERR("\tVertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
CLAMP(dw->weight, 0.0f, 1.0f);
- vert_weights_fixed = TRUE;
+ vert_weights_fixed = true;
}
}
@@ -776,7 +776,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
j--;
dw = dv->dw + j;
- vert_weights_fixed = TRUE;
+ vert_weights_fixed = true;
}
else { /* all freed */
break;
@@ -812,7 +812,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (mesh && mesh->mselect) {
MSelect *msel;
- int free_msel = FALSE;
+ bool free_msel = false;
for (i = 0, msel = mesh->mselect; i < mesh->totselect; i++, msel++) {
int tot_elem = 0;
@@ -820,7 +820,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (msel->index < 0) {
PRINT_ERR("\tMesh select element %d type %d index is negative, "
"resetting selection stack.\n", i, msel->type);
- free_msel = TRUE;
+ free_msel = true;
break;
}
@@ -840,7 +840,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
PRINT_ERR("\tMesh select element %d type %d index %d is larger than data array size %d, "
"resetting selection stack.\n", i, msel->type, msel->index, tot_elem);
- free_msel = TRUE;
+ free_msel = true;
break;
}
}
@@ -1095,12 +1095,12 @@ void BKE_mesh_strip_loose_polysloops(Mesh *me)
int *new_idx = MEM_mallocN(sizeof(int) * me->totloop, __func__);
for (a = b = 0, p = me->mpoly; a < me->totpoly; a++, p++) {
- int invalid = FALSE;
+ bool invalid = false;
int i = p->loopstart;
int stop = i + p->totloop;
if (stop > me->totloop || stop < i) {
- invalid = TRUE;
+ invalid = true;
}
else {
l = &me->mloop[i];
@@ -1108,7 +1108,7 @@ void BKE_mesh_strip_loose_polysloops(Mesh *me)
/* If one of the poly's loops is invalid, the whole poly is invalid! */
for (; i--; l++) {
if (l->e == INVALID_LOOP_EDGE_MARKER) {
- invalid = TRUE;
+ invalid = true;
break;
}
}
@@ -1431,7 +1431,7 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool update, const bool select)
med = CustomData_get_layer(&edata, CD_MEDGE);
for (ehi = BLI_edgehashIterator_new(eh), i = 0;
- BLI_edgehashIterator_isDone(ehi) == FALSE;
+ BLI_edgehashIterator_isDone(ehi) == false;
BLI_edgehashIterator_step(ehi), ++i, ++med)
{
if (update && (med_orig = BLI_edgehashIterator_getValue(ehi))) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 01:40:58 +0300