Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T41691: Blender-internal crash (counting edges)

Browse Source
This commit is contained in:
Campbell Barton
2014-09-03 17:31:58 +10:00
parent f71da49bb8
commit c1ae899463
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/intern/source/convertblender.c
View File

@@ -2930,8 +2930,7 @@ static struct edgesort *make_mesh_edge_lookup(DerivedMesh *dm, int *totedgesort)
/* make sorted table with edges and face indices in it */ /* make sorted table with edges and face indices in it */
for (a= totface, mf= mface; a>0; a--, mf++) { for (a= totface, mf= mface; a>0; a--, mf++) {
if (mf->v4) totedge+=4; totedge += mf->v4 ? 4 : 3;
else if (mf->v3) totedge+=3;
} }
if (totedge==0) if (totedge==0)
@@ -2946,8 +2945,9 @@ static struct edgesort *make_mesh_edge_lookup(DerivedMesh *dm, int *totedgesort)
to_edgesort(ed++, 2, 3, mf->v3, mf->v4, a); to_edgesort(ed++, 2, 3, mf->v3, mf->v4, a);
to_edgesort(ed++, 3, 0, mf->v4, mf->v1, a); to_edgesort(ed++, 3, 0, mf->v4, mf->v1, a);
} }
else if (mf->v3) else {
to_edgesort(ed++, 2, 3, mf->v3, mf->v1, a); to_edgesort(ed++, 2, 3, mf->v3, mf->v1, a);
}
} }
qsort(edsort, totedge, sizeof(struct edgesort), vergedgesort); qsort(edsort, totedge, sizeof(struct edgesort), vergedgesort);