blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix bug in validate mesh code (could use index out of range).

This commit is contained in:
Bastien Montagne 2014-07-25 16:45:26 +02:00
parent fc55c41bba
commit 51120efbce
Notes: blender-bot 2023-02-14 10:17:46 +01:00 
Referenced by issue #41409, Copy Custom Property function does nothing with pose bones
Referenced by issue #41231, Cycles 3D Viewport Preview crashes after adjusting nodes.
Referenced by issue #41191, Face snapping doesn't work properly
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/mesh_validate.c
View File

@ -164,16 +164,20 @@ static int search_poly_cmp(const void *v1, const void *v2)
{
const SortPoly *sp1 = v1, *sp2 = v2;
const int max_idx = sp1->numverts > sp2->numverts ? sp2->numverts : sp1->numverts;
int idx = 0;
int idx;
/* Reject all invalid polys at end of list! */
if (sp1->invalid || sp2->invalid)
return sp1->invalid && sp2->invalid ? 0 : sp1->invalid ? 1 : -1;
/* Else, sort on first non-egal verts (remember verts of valid polys are sorted). */
while (idx < max_idx && sp1->verts[idx] == sp2->verts[idx])
idx++;
return sp1->verts[idx] > sp2->verts[idx] ? 1 : sp1->verts[idx] < sp2->verts[idx] ? -1 :
sp1->numverts > sp2->numverts ? 1 : sp1->numverts < sp2->numverts ? -1 : 0;
return sp1->invalid ? (sp2->invalid ? 0 : 1) : -1;
/* Else, sort on first non-equal verts (remember verts of valid polys are sorted). */
for (idx = 0; idx < max_idx; idx++) {
const int v1 = sp1->verts[idx];
const int v2 = sp2->verts[idx];
if (v1 != v2) {
return (v1 > v2) ? 1 : -1;
}
}
return sp1->numverts > sp2->numverts ? 1 : sp1->numverts < sp2->numverts ? -1 : 0;
}
static int search_polyloop_cmp(const void *v1, const void *v2)