->Join triangles fixes.

There was a bug with the new join triangles code that caused concave faces to be
created. This is fixed now and is tweakable using the the 'threshold' value set
in the 'Mesh Tools' panel in editbuttons.

Also removed the popup notice telling you how many triangles had been joined. It
was only there for debugging purposes.

1 files changed, 2 insertions, 5 deletions

diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index 254e240b44e..86041a22370 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -3684,7 +3684,7 @@ void join_triangles(void)
 	EditFace *efa;
 	EditEdge *eed, **faceEdge, *faceEdges[5], **edsortblock, **edb;
 	EditVert **faceVert1, *faceVerts1[5], **faceVert2, *faceVerts2[5];
-	float limit = 25;
+	float limit = G.scene->toolsettings->select_thresh * 10;
 	int i, paircount, joincount, totFacePairLs, respectvcol = 1, respectuv = 1, match, matchar[3];
 	FacePairL *fpl1;
 	
@@ -3850,9 +3850,6 @@ void join_triangles(void)
 		}
 	}
 	
-	if(joincount) notice("Created %i new quads /n", joincount);
-	else notice("nothing done");
-	
 	free_tagged_facelist(em->faces.first);
 	MEM_freeN(edsortblock);
 	for(eed=em->edges.first; eed; eed=eed->next){ 
@@ -7238,4 +7235,4 @@ void loop_to_region(void)
 	DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 	allqueue(REDRAWVIEW3D, 0);
 	BIF_undo_push("Edge Loop to Face Region");
-}
+}
\ No newline at end of file