diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-03 11:31:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-03 11:33:37 +0400 |
commit | c1ae8994638786d3721b58be8c8b77dc0a329bcf (patch) | |
tree | e5e721ef7a15ed68985b953864ea121a2eb8f859 | |
parent | f71da49bb85a49c6a6a5b9807963ca8db762b7c3 (diff) |
Fix T41691: Blender-internal crash (counting edges)
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 55146162f25..e6f054583b1 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -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 */ for (a= totface, mf= mface; a>0; a--, mf++) { - if (mf->v4) totedge+=4; - else if (mf->v3) totedge+=3; + totedge += mf->v4 ? 4 : 3; } 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++, 3, 0, mf->v4, mf->v1, a); } - else if (mf->v3) + else { to_edgesort(ed++, 2, 3, mf->v3, mf->v1, a); + } } qsort(edsort, totedge, sizeof(struct edgesort), vergedgesort); |