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

Removing Auto-Fgon feature till it can be a little better implemented and integrated

Browse Source
This commit is contained in:
Johnny Matthews
2005-09-08 12:59:47 +00:00
parent 3364b71c76
commit 34ae14778c
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/src/buttons_editing.c
View File

@@ -2635,9 +2635,9 @@ static void editing_panel_mesh_tools(Object *ob, Mesh *me)
if(uiNewPanel(curarea, block, "Mesh Tools", "Editing", 640, 0, 318, 204)==0) return;
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, B_AUTOFGON, 0, "FGon", 10,195,30,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' To create FGon on inner edges where possible");
uiDefButBitS(block, TOG, B_BEAUTY, 0, "Bty", 30,195,30,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' to split faces in halves instead of quarters using Long Edges Unless short is selected");
uiDefButBitS(block, TOG, B_BEAUTY_SHORT, 0, "Shrt", 60,195,30,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' to split faces in halves instead of quarters using Short Edges");
//uiDefButBitS(block, TOG, B_AUTOFGON, 0, "FGon", 10,195,30,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' To create FGon on inner edges where possible");
uiDefButBitS(block, TOG, B_BEAUTY, 0, "Beauty", 10,195,40,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' to split faces in halves instead of quarters using Long Edges Unless short is selected");
uiDefButBitS(block, TOG, B_BEAUTY_SHORT, 0, "Short", 50,195,40,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "Causes 'Subdivide' to split faces in halves instead of quarters using Short Edges");
uiDefBut(block, BUT,B_SUBDIV,"Subdivide", 90,195,80,19, 0, 0, 0, 0, 0, "Splits selected faces into halves or quarters");

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

@@ -1634,9 +1634,9 @@ static void fill_quad_double_adj_path(EditFace *efa, struct GHash *gh, int numcu
hold = addfacelist(verts[0][0],verts[1][vertsize-1],v[(start2+2)%4],NULL,NULL,NULL);
hold->e1->f2 |= EDGEINNER;
facecopy(efa,hold);
if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
hold->e1->h |= EM_FGON;
}
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
// hold->e1->h |= EM_FGON;
//}
// Make side faces
for(i=0;i<numcuts;i++){
@@ -1644,7 +1644,7 @@ static void fill_quad_double_adj_path(EditFace *efa, struct GHash *gh, int numcu
hold->e2->f2 |= EDGEINNER;
facecopy(efa,hold);
}
EM_fgon_flags();
//EM_fgon_flags();
}
static void fill_quad_double_adj_fan(EditFace *efa, struct GHash *gh, int numcuts)
@@ -1789,9 +1789,9 @@ static void fill_quad_double_adj_inner(EditFace *efa, struct GHash *gh, int numc
hold->e2->f2 |= EDGEINNER;
facecopy(efa,hold);
if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
hold->e1->h |= EM_FGON;
}
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
// hold->e1->h |= EM_FGON;
//}
// Add Fill Quads (if # cuts > 1)
for(i=0;i<numcuts-1;i++){
@@ -1805,12 +1805,12 @@ static void fill_quad_double_adj_inner(EditFace *efa, struct GHash *gh, int numc
hold->e4->f2 |= EDGEINNER;
facecopy(efa,hold);
if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
hold->e1->h |= EM_FGON;
}
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
// hold->e1->h |= EM_FGON;
//}
}
EM_fgon_flags();
//EM_fgon_flags();
MEM_freeN(inner);
}
@@ -2015,18 +2015,18 @@ static void fill_quad_triple(EditFace *efa, struct GHash *gh, int numcuts)
// Also Make inner quad
hold = addfacelist(verts[1][numcuts/2],verts[1][(numcuts/2)+1],verts[2][numcuts/2],verts[0][(numcuts/2)+1],NULL,NULL);
hold->e3->f2 |= EDGEINNER;
if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
hold->e3->h |= EM_FGON;
}
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
// hold->e3->h |= EM_FGON;
//}
facecopy(efa,hold);
repeats = (numcuts / 2) -1;
} else {
// Make inner tri
hold = addfacelist(verts[1][(numcuts/2)+1],verts[2][(numcuts/2)+1],verts[0][(numcuts/2)+1],NULL,NULL,NULL);
hold->e2->f2 |= EDGEINNER;
if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
hold->e2->h |= EM_FGON;
}
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON){
// hold->e2->h |= EM_FGON;
//}
facecopy(efa,hold);
repeats = ((numcuts+1) / 2)-1;
}
@@ -2052,7 +2052,7 @@ static void fill_quad_triple(EditFace *efa, struct GHash *gh, int numcuts)
hold->e2->f2 |= EDGEINNER;
facecopy(efa,hold);
}
EM_fgon_flags();
//EM_fgon_flags();
}
static void fill_quad_quadruple(EditFace *efa, struct GHash *gh, int numcuts,float rad,int beauty)