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

Bug fix #3098

Browse Source 
Grmble... and now the feature ALT+J 'join triangles' broke. :)
Also found out the Fkey option didn't work anymore on 2 triangles (makes 1
quad too). Luckily we got people testing eh!
This commit is contained in:
Ton Roosendaal
2005-09-24 15:46:08 +00:00
parent e5b9f62c6e
commit 843bc28d37
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/editmesh_lib.c
View File

@@ -1394,7 +1394,7 @@ int compareface(EditFace *vl1, EditFace *vl2, int test)
return 1;
}
/* this also prevents triangles being made in quads */
/* checks for existance, not tria overlapping inside quad */
EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4)
{
EditMesh *em = G.editMesh;
@@ -1407,7 +1407,7 @@ EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4)
efa= em->faces.first;
while(efa) {
if(compareface(&efatest, efa, 3)) return efa;
if(compareface(&efatest, efa, 4)) return efa;
efa= efa->next;
}
return NULL;