sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for crash in Mesh EditMode "Join triangles" (JKEY). Found & code

Browse Source 
provided by Campbell Barton, thanks mate! :)

Note; this tool gives quickly bad results... also errors printed in the
give_quad_verts call. Who likes to attack this!
This commit is contained in:
Ton Roosendaal 2005-05-06 12:12:26 +00:00
parent 799d7e3f98
commit c68c3c253f
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/editmesh_tools.c
View File

@ -2307,6 +2307,7 @@ void join_triangles(void)
1-----2 1-----2 1-----2 1-----2
*/ */
/* make new faces */ /* make new faces */
if(v1 && v2 && v3 && v4) {
if( convex(v1->co, v2->co, v3->co, v4->co) ) { if( convex(v1->co, v2->co, v3->co, v4->co) ) {
if(exist_face(v1, v2, v3, v4)==0) { if(exist_face(v1, v2, v3, v4)==0) {
w = addfacelist(v1, v2, v3, v4, efaa[0], NULL); /* seam edge may get broken */ w = addfacelist(v1, v2, v3, v4, efaa[0], NULL); /* seam edge may get broken */
@ -2327,6 +2328,7 @@ void join_triangles(void)
} /* endif test convex */ } /* endif test convex */
} }
} }
}
eed= nexted; eed= nexted;
} }
free_tagged_edgelist(em->edges.first); free_tagged_edgelist(em->edges.first);