bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

bugfix [#24398] Select Nth

Browse Source 
- use first selected if non active (clears confusion since this isn't at all clear)
- dont take unselected into account when calculating connectivity, would mess up in many cases.
This commit is contained in:
Campbell Barton 2010-11-02 11:14:04 +00:00
parent 55ad862386
commit 342e79461b
2 changed files with 105 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
source/blender/editors/mesh/editmesh_lib.c
View File

@ -2578,18 +2578,23 @@ void em_deselect_nth_face(EditMesh *em, int nth, EditFace *efa_act)
ok = 0; ok = 0;
for (efa= em->faces.first; efa; efa= efa->next) { for (efa= em->faces.first; efa; efa= efa->next) {
if(efa->tmp.l==1) { /* initialize */ if(efa->f & SELECT) {
tag_face_edges(efa); if(efa->tmp.l==1) { /* initialize */
tag_face_edges(efa);
}
if(efa->tmp.l) {
efa->tmp.l++;
}
} }
if(efa->tmp.l)
efa->tmp.l++;
} }
for (efa= em->faces.first; efa; efa= efa->next) { for (efa= em->faces.first; efa; efa= efa->next) {
if(efa->tmp.l==0 && tag_face_edges_test(efa)) { if(efa->f & SELECT) {
efa->tmp.l= 1; if(efa->tmp.l==0 && tag_face_edges_test(efa)) {
ok = 1; /* keep looping */ efa->tmp.l= 1;
ok = 1; /* keep looping */
}
} }
} }
} }
@ -2644,18 +2649,23 @@ void em_deselect_nth_edge(EditMesh *em, int nth, EditEdge *eed_act)
ok = 0; ok = 0;
for (eed= em->edges.first; eed; eed= eed->next) { for (eed= em->edges.first; eed; eed= eed->next) {
if(eed->tmp.l==1) { /* initialize */ if(eed->f & SELECT) {
tag_edge_verts(eed); if(eed->tmp.l==1) { /* initialize */
tag_edge_verts(eed);
}
if(eed->tmp.l) {
eed->tmp.l++;
}
} }
if(eed->tmp.l)
eed->tmp.l++;
} }
for (eed= em->edges.first; eed; eed= eed->next) { for (eed= em->edges.first; eed; eed= eed->next) {
if(eed->tmp.l==0 && tag_edge_verts_test(eed)) { if(eed->f & SELECT) {
eed->tmp.l= 1; if(eed->tmp.l==0 && tag_edge_verts_test(eed)) {
ok = 1; /* keep looping */ eed->tmp.l= 1;
ok = 1; /* keep looping */
}
} }
} }
} }
@ -2711,18 +2721,22 @@ void em_deselect_nth_vert(EditMesh *em, int nth, EditVert *eve_act)
ok = 0; ok = 0;
for (eve= em->verts.first; eve; eve= eve->next) { for (eve= em->verts.first; eve; eve= eve->next) {
if(eve->tmp.l) if(eve->f & SELECT) {
eve->tmp.l++; if(eve->tmp.l)
eve->tmp.l++;
}
} }
for (eed= em->edges.first; eed; eed= eed->next) { for (eed= em->edges.first; eed; eed= eed->next) {
if(eed->v1->tmp.l==2 && eed->v2->tmp.l==0) { /* initialize */ if(eed->f & SELECT) {
eed->v2->tmp.l= 1; if(eed->v1->tmp.l==2 && eed->v2->tmp.l==0) { /* initialize */
ok = 1; /* keep looping */ eed->v2->tmp.l= 1;
} ok = 1; /* keep looping */
else if(eed->v2->tmp.l==2 && eed->v1->tmp.l==0) { /* initialize */ }
eed->v1->tmp.l= 1; else if(eed->v2->tmp.l==2 && eed->v1->tmp.l==0) { /* initialize */
ok = 1; /* keep looping */ eed->v1->tmp.l= 1;
ok = 1; /* keep looping */
}
} }
} }
} }
@ -2740,30 +2754,77 @@ void em_deselect_nth_vert(EditMesh *em, int nth, EditVert *eve_act)
// EM_nfaces_selected(em); // flush does these // EM_nfaces_selected(em); // flush does these
} }
int EM_deselect_nth(EditMesh *em, int nth) static void deselect_nth_active(EditMesh *em, EditVert **eve_p, EditEdge **eed_p, EditFace **efa_p)
{ {
EditSelection *ese; EditSelection *ese;
ese = ((EditSelection*)em->selected.last);
*eve_p= NULL;
*eed_p= NULL;
*efa_p= NULL;
ese= (EditSelection*)em->selected.last;
if(ese) { if(ese) {
if(ese->type == EDITVERT) { switch(ese->type) {
em_deselect_nth_vert(em, nth, (EditVert*)ese->data); case EDITVERT:
return 1; *eve_p= (EditVert *)ese->data;
} return;
case EDITEDGE:
if(ese->type == EDITEDGE) { *eed_p= (EditEdge *)ese->data;
em_deselect_nth_edge(em, nth, (EditEdge*)ese->data); return;
return 1; case EDITFACE:
} *efa_p= (EditFace *)ese->data;
} return;
else {
EditFace *efa_act = EM_get_actFace(em, 0);
if(efa_act) {
em_deselect_nth_face(em, nth, efa_act);
return 1;
} }
} }
return 0; if(em->selectmode & SCE_SELECT_VERTEX) {
EditVert *eve;
for (eve= em->verts.first; eve; eve= eve->next) {
if(eve->f & SELECT) {
*eve_p= eve;
return;
}
}
}
if(em->selectmode & SCE_SELECT_EDGE) {
EditEdge *eed;
for (eed= em->edges.first; eed; eed= eed->next) {
if(eed->f & SELECT) {
*eed_p= eed;
return;
}
}
}
if(em->selectmode & SCE_SELECT_FACE) {
EditFace *efa= EM_get_actFace(em, 1);
if(efa) {
*efa_p= efa;
return;
}
}
}
int EM_deselect_nth(EditMesh *em, int nth)
{
EditVert *eve;
EditEdge *eed;
EditFace *efa;
deselect_nth_active(em, &eve, &eed, &efa);
if(eve)
em_deselect_nth_vert(em, nth, eve);
else if (eed)
em_deselect_nth_edge(em, nth, eed);
else if (efa)
em_deselect_nth_face(em, nth, efa);
else
return 0;
return 1;
} }
void EM_project_snap_verts(bContext *C, ARegion *ar, Object *obedit, EditMesh *em) void EM_project_snap_verts(bContext *C, ARegion *ar, Object *obedit, EditMesh *em)

5
source/blender/editors/mesh/editmesh_mods.c
View File

@ -4581,10 +4581,7 @@ static int mesh_select_nth_exec(bContext *C, wmOperator *op)
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
int nth = RNA_int_get(op->ptr, "nth"); int nth = RNA_int_get(op->ptr, "nth");
if(EM_deselect_nth(em, nth) == 0) { EM_deselect_nth(em, nth);
BKE_report(op->reports, RPT_ERROR, "Mesh has no active vert/edge/face.");
return OPERATOR_CANCELLED;
}
BKE_mesh_end_editmesh(obedit->data, em); BKE_mesh_end_editmesh(obedit->data, em);