Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

patch from Banlu Kemiyatorn

Browse Source 
* 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
This commit is contained in:
Campbell Barton
2009-03-20 02:26:02 +00:00
parent 2a373f6c44
commit a1e05f4617
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3352,11 +3352,9 @@ void join_triangles(void)
if(v1 && v2 && v3 && v4){ if(v1 && v2 && v3 && v4){
/*test if simple island first. This mimics 2.42 behaviour and the tests are less restrictive.*/ /*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(efaa[0]->tmp.l == 1 && efaa[1]->tmp.l == 1){
if( convex(v1->co, v2->co, v3->co, v4->co) ){ eed->f1 |= T2QJOIN;
eed->f1 |= T2QJOIN; efaa[0]->f1 = 1; //mark for join
efaa[0]->f1 = 1; //mark for join efaa[1]->f1 = 1; //mark for join
efaa[1]->f1 = 1; //mark for join
}
} }
else{ else{
@@ -3615,10 +3613,6 @@ static void edge_rotate(EditEdge *eed,int dir)
if(numshared > 1) if(numshared > 1)
return; 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 /* we want to construct an array of vertex indicis in both faces, starting at
the last vertex of the edge being rotated. the last vertex of the edge being rotated.
- first we find the two vertices that lie on the rotating edge - first we find the two vertices that lie on the rotating edge