diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 19:23:49 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 19:23:49 +0400 |
| commit | 6a8ce04e543dd04678504db960bf19be1b487429 (patch) | |
| tree | 7becd305f8e4cd7ef89a6d0d28c81de89eca5332 /source/blender/editors/mesh/editmesh_tools.c | |
| parent | 44160c97474215d7ed71b2b03bb971889ce4b18e (diff) | |
Fix #20084: merging triangles with different normals into a quad
would create a hole, just crappy editmesh code, no need to merge
to bmesh.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 52e1b3636ea..4477f375aab 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3094,21 +3094,21 @@ static void givequadverts(EditFace *efa, EditFace *efa1, EditVert **v1, EditVert if VTEST(efa1, 1, efa) { *v3= efa1->v1; - *v4= efa1->v2; + *v4= (efa1->v2 == *v2)? efa1->v3: efa1->v2; vindex[2]= 0; - vindex[3]= 1; + vindex[3]= (efa1->v2 == *v2)? 2: 1; } else if VTEST(efa1, 2, efa) { *v3= efa1->v2; - *v4= efa1->v3; + *v4= (efa1->v3 == *v2)? efa1->v1: efa1->v3; vindex[2]= 1; - vindex[3]= 2; + vindex[3]= (efa1->v3 == *v2)? 0: 2; } else if VTEST(efa1, 3, efa) { *v3= efa1->v3; - *v4= efa1->v1; + *v4= (efa1->v1 == *v2)? efa1->v2: efa1->v1; vindex[2]= 2; - vindex[3]= 0; + vindex[3]= (efa1->v1 == *v2)? 1: 0; } else *v3= *v4= NULL; |