diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-09-24 19:46:08 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-09-24 19:46:08 +0400 |
| commit | 843bc28d37fa32889671ee7ae6ffb71190b4f890 (patch) | |
| tree | ea5f478e58784c17e80851e8ca3c0c32ad04df84 /source/blender/src/editmesh_lib.c | |
| parent | e5b9f62c6e82d4b7ab0d205cf0a8bb4ef8b90c52 (diff) | |
Bug fix #3098
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!
Diffstat (limited to 'source/blender/src/editmesh_lib.c')
| -rw-r--r-- | source/blender/src/editmesh_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c index f00a5adc50e..72e3aa18867 100644 --- a/source/blender/src/editmesh_lib.c +++ b/source/blender/src/editmesh_lib.c @@ -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; |