kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

This patch makes the vertex loop select tool only select edges which are part of 2 faces, this cleans up some incorrect selections the tool was making around areas in the mesh where faces had been deleted.

Browse Source 
closes bug 1343

guitarGeek
This commit is contained in:
Johnny Matthews 2004-06-18 20:04:39 +00:00
parent ace24ac5b4
commit d222422c7f
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/src/editmesh.c
View File

@ -9442,6 +9442,20 @@ void selectrandom_mesh(void) /* randomly selects a user-set % of vertices */
} }
} }
short edgeFaces(EditEdge *e){
EditMesh *em = G.editMesh;
EditVlak *search=NULL;
short count = 0;
search = em->faces.first;
while(search){
if((search->e1 == e || search->e2 == e) || (search->e3 == e || search->e4 == e))
count++;
search = search->next;
}
return count;
}
/* this utility function checks to see if 2 edit edges share a face, /* this utility function checks to see if 2 edit edges share a face,
returns 1 if they do returns 1 if they do
returns 0 if they do not, or if the function is passed the same edge 2 times returns 0 if they do not, or if the function is passed the same edge 2 times
@ -9493,7 +9507,7 @@ void vertex_loop_select()
scrarea_do_windraw(curarea); scrarea_do_windraw(curarea);
nearest = findnearestedge(); nearest = findnearestedge();
if (nearest) { if (nearest && edgeFaces(nearest)==2) {
for(search = em->edges.first;search;search=search->next) for(search = em->edges.first;search;search=search->next)
search->f &= ~32; search->f &= ~32;
@ -9505,6 +9519,7 @@ void vertex_loop_select()
looking = 1; looking = 1;
while(looking){ while(looking){
if(protect++ > numEdges) break; if(protect++ > numEdges) break;
if(edgeFaces(compEdge) != 2) break;
/*Find Edges that have v1*/ /*Find Edges that have v1*/
edgeValCount = -1; edgeValCount = -1;
EdgeVal[0] = EdgeVal[1] = EdgeVal[2] = NULL; EdgeVal[0] = EdgeVal[1] = EdgeVal[2] = NULL;
@ -9513,11 +9528,13 @@ void vertex_loop_select()
if(valSearch->v1 == v1 || valSearch->v2 == v1){ if(valSearch->v1 == v1 || valSearch->v2 == v1){
if(valSearch != compEdge){ if(valSearch != compEdge){
if((valSearch->v1->h == 0) && (valSearch->v2->h == 0)){ if((valSearch->v1->h == 0) && (valSearch->v2->h == 0)){
if(edgeFaces(valSearch) == 2){
edgeValCount++; edgeValCount++;
EdgeVal[edgeValCount] = valSearch; EdgeVal[edgeValCount] = valSearch;
} }
} }
} }
}
if(edgeValCount == 3)break; if(edgeValCount == 3)break;
} }
/* Check that there was a valance of 4*/ /* Check that there was a valance of 4*/
@ -9555,7 +9572,7 @@ void vertex_loop_select()
protect = 0; protect = 0;
while(looking/* && !looped*/){ while(looking/* && !looped*/){
if(protect++ > numEdges) break; if(protect++ > numEdges) break;
if(edgeFaces(compEdge) != 2) break;
/*Find Edges that have v1*/ /*Find Edges that have v1*/
edgeValCount = -1; edgeValCount = -1;
EdgeVal[0] = EdgeVal[1] = EdgeVal[2] = NULL; EdgeVal[0] = EdgeVal[1] = EdgeVal[2] = NULL;
@ -9564,11 +9581,13 @@ void vertex_loop_select()
if(valSearch->v1 == v2 || valSearch->v2 == v2){ if(valSearch->v1 == v2 || valSearch->v2 == v2){
if(valSearch != compEdge){ if(valSearch != compEdge){
if((valSearch->v1->h == 0) && (valSearch->v2->h == 0)){ if((valSearch->v1->h == 0) && (valSearch->v2->h == 0)){
if(edgeFaces(valSearch) == 2){
edgeValCount++; edgeValCount++;
EdgeVal[edgeValCount] = valSearch; EdgeVal[edgeValCount] = valSearch;
} }
} }
} }
}
if(edgeValCount == 3)break; if(edgeValCount == 3)break;
} }
/* Check that there was a valance of 4*/ /* Check that there was a valance of 4*/