diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
commit | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (patch) | |
tree | f5742a0f4414a99bd6738aae9cf4dc21b307fbfc /source/blender/blenkernel/intern/mesh_validate.c | |
parent | da00a50f7f48bfd95924705e69babea41f9d7b2b (diff) | |
parent | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_validate.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index f7509d07ca4..8301b6a42b1 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -63,8 +63,8 @@ typedef union { } EdgeUUID; typedef struct SortFace { - EdgeUUID es[4]; - unsigned int index; + EdgeUUID es[4]; + unsigned int index; } SortFace; /* Used to detect polys (faces) using exactly the same vertices. */ @@ -127,28 +127,28 @@ static int search_face_cmp(const void *v1, const void *v2) if (sfa->es[0].edval > sfb->es[0].edval) { return 1; } - else if (sfa->es[0].edval < sfb->es[0].edval) { + else if (sfa->es[0].edval < sfb->es[0].edval) { return -1; } - else if (sfa->es[1].edval > sfb->es[1].edval) { + else if (sfa->es[1].edval > sfb->es[1].edval) { return 1; } - else if (sfa->es[1].edval < sfb->es[1].edval) { + else if (sfa->es[1].edval < sfb->es[1].edval) { return -1; } - else if (sfa->es[2].edval > sfb->es[2].edval) { + else if (sfa->es[2].edval > sfb->es[2].edval) { return 1; } - else if (sfa->es[2].edval < sfb->es[2].edval) { + else if (sfa->es[2].edval < sfb->es[2].edval) { return -1; } - else if (sfa->es[3].edval > sfb->es[3].edval) { + else if (sfa->es[3].edval > sfb->es[3].edval) { return 1; } - else if (sfa->es[3].edval < sfb->es[3].edval) { + else if (sfa->es[3].edval < sfb->es[3].edval) { return -1; } |