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

Modified Files:

Browse Source 
source/blender/blenlib/BLI_editVert.h
 	source/blender/include/BIF_editmesh.h
 	source/blender/src/edit.c source/blender/src/editmesh.c
 	source/blender/src/editmesh_lib.c
 	source/blender/src/editmesh_mods.c
 	source/blender/src/editmesh_tools.c
 	source/blender/src/header_view3d.c
Log:
	Commit of the 'upgraded merge tools' (Patch #3345) and 'inclusive selection mode conversion' (Patch #3768).
This commit is contained in:
Geoffrey Bantle
2006-02-13 22:49:46 +00:00
parent 9104862f48
commit 1f21e2eea7
8 changed files with 588 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/blender/src/editmesh_lib.c
View File

@@ -392,6 +392,70 @@ void EM_selectmode_flush(void)
}
void EM_convertsel(short oldmode, short selectmode)
{
EditMesh *em = G.editMesh;
EditVert *eve;
EditEdge *eed;
EditFace *efa;
/*clear flags*/
for(eve= em->verts.first; eve; eve= eve->next) eve->f1 = 0;
for(eed= em->edges.first; eed; eed= eed->next) eed->f1 = 0;
for(efa= em->faces.first; efa; efa= efa->next) efa->f1 = 0;
/*have to find out what the selectionmode was previously*/
if(oldmode == SCE_SELECT_VERTEX) {
if(selectmode == SCE_SELECT_EDGE){
/*select all edges associated with every selected vertex*/
for(eed= em->edges.first; eed; eed= eed->next){
if(eed->v1->f&SELECT) eed->f1 = 1;
else if(eed->v2->f&SELECT) eed->f1 = 1;
}
for(eed= em->edges.first; eed; eed= eed->next){
if(eed->f1 == 1) EM_select_edge(eed,1);
}
}
else if(selectmode == SCE_SELECT_FACE){
/*select all faces associated with every selected vertex*/
for(efa= em->faces.first; efa; efa= efa->next){
if(efa->v1->f&SELECT) efa->f1 = 1;
else if(efa->v2->f&SELECT) efa->f1 = 1;
else if(efa->v3->f&SELECT) efa->f1 = 1;
else{
if(efa->v4){
if(efa->v4->f&SELECT) efa->f1 =1;
}
}
}
for(efa= em->faces.first; efa; efa= efa->next){
if(efa->f1 == 1) EM_select_face(efa,1);
}
check_fgons_selection();
countall();
}
}
if(oldmode == SCE_SELECT_EDGE){
if(selectmode == SCE_SELECT_FACE){
for(efa= em->faces.first; efa; efa= efa->next){
if(efa->e1->f&SELECT) efa->f1 = 1;
else if(efa->e2->f&SELECT) efa->f1 = 1;
else if(efa->e3->f&SELECT) efa->f1 = 1;
else if(efa->e4){
if(efa->e4->f&SELECT) efa->f1 = 1;
}
}
for(efa= em->faces.first; efa; efa= efa->next){
if(efa->f1 == 1) EM_select_face(efa,1);
}
check_fgons_selection();
countall();
}
}
}
/* when switching select mode, makes sure selection is consistant for editing */
/* also for paranoia checks to make sure edge or face mode works */
void EM_selectmode_set(void)
@@ -424,6 +488,7 @@ void EM_selectmode_set(void)
for(efa= em->faces.first; efa; efa= efa->next)
if(efa->f & SELECT) EM_select_face(efa, 1);
}
BIF_undo_push("Selectmode Set");
}
/* paranoia check, actually only for entering editmode. rule: