archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

->Join triangles fixes.

Browse Source 
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.
This commit is contained in:
Geoffrey Bantle
2006-11-08 05:18:11 +00:00
parent e00b6e52b2
commit c6976219fb
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3684,7 +3684,7 @@ void join_triangles(void)
EditFace *efa; EditFace *efa;
EditEdge *eed, **faceEdge, *faceEdges[5], **edsortblock, **edb; EditEdge *eed, **faceEdge, *faceEdges[5], **edsortblock, **edb;
EditVert **faceVert1, *faceVerts1[5], **faceVert2, *faceVerts2[5]; 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]; int i, paircount, joincount, totFacePairLs, respectvcol = 1, respectuv = 1, match, matchar[3];
FacePairL *fpl1; 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); free_tagged_facelist(em->faces.first);
MEM_freeN(edsortblock); MEM_freeN(edsortblock);
for(eed=em->edges.first; eed; eed=eed->next){ for(eed=em->edges.first; eed; eed=eed->next){