Commit: c1ae8994638786d3721b58be8c8b77dc0a329bcf
Author: Campbell Barton
Date: Wed Sep 3 17:31:58 2014 +1000
Branches: master
https://developer.blender.org/rBc1ae8994638786d3721b58be8c8b77dc0a329bcf
Fix T41691: Blender-internal crash (counting edges)
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c
b/source/blender/render/intern/source/convertblender.c
index 5514616..e6f0545 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
