From a1e05f46171dfa5c764a77a469b56adba7120940 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 20 Mar 2009 02:26:02 +0000 Subject: [PATCH] patch from Banlu Kemiyatorn * when joining only 2 faces dont check they are convex * allow edge rotate for non planer faces - Both were very annoying especially when sub-surf modeling with edge loops --- source/blender/src/editmesh_tools.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 76f1443616f..690b4481ec9 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -3352,11 +3352,9 @@ void join_triangles(void) if(v1 && v2 && v3 && v4){ /*test if simple island first. This mimics 2.42 behaviour and the tests are less restrictive.*/ if(efaa[0]->tmp.l == 1 && efaa[1]->tmp.l == 1){ - if( convex(v1->co, v2->co, v3->co, v4->co) ){ - eed->f1 |= T2QJOIN; - efaa[0]->f1 = 1; //mark for join - efaa[1]->f1 = 1; //mark for join - } + eed->f1 |= T2QJOIN; + efaa[0]->f1 = 1; //mark for join + efaa[1]->f1 = 1; //mark for join } else{ @@ -3615,10 +3613,6 @@ static void edge_rotate(EditEdge *eed,int dir) if(numshared > 1) return; - /* coplaner faces only please */ - if(Inpf(face[0]->n,face[1]->n) <= 0.000001) - return; - /* we want to construct an array of vertex indicis in both faces, starting at the last vertex of the edge being rotated. - first we find the two vertices that lie on the rotating edge