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

Fix T42510: Limit by seams fails in edge/vert mode

Browse Source
This commit is contained in:
Campbell Barton 2015-05-15 17:08:27 +10:00
parent 547b676181
commit ba9dbaae64
1 changed files with 112 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
source/blender/editors/mesh/editmesh_select.c
View File

@ -2353,7 +2353,6 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMesh *bm = em->bm; BMesh *bm = em->bm;
BMIter iter; BMIter iter;
BMEdge *e;
BMWalker walker; BMWalker walker;
int limit; int limit;
@ -2362,63 +2361,136 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
limit = RNA_boolean_get(op->ptr, "limit"); limit = RNA_boolean_get(op->ptr, "limit");
if (em->selectmode == SCE_SELECT_FACE) { if (limit) {
BMFace *efa; BMEdge *e;
/* grr, shouldn't need to alloc BMO flags here */
BM_mesh_elem_toolflags_ensure(bm);
if (em->selectmode == SCE_SELECT_FACE) {
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
const bool is_walk_ok = (
BM_elem_flag_test(e, BM_ELEM_SEAM) == 0);
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BMO_elem_flag_set(bm, e, BMO_ELE_TAG, is_walk_ok);
BM_elem_flag_set(efa, BM_ELEM_TAG, BM_elem_flag_test(efa, BM_ELEM_SELECT)); }
}
else {
/* don't delimit selected edges in vert/edge mode */
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
const bool is_walk_ok = (
BM_elem_flag_test(e, BM_ELEM_SEAM) == 0 ||
BM_elem_flag_test(e, BM_ELEM_SELECT));
BMO_elem_flag_set(bm, e, BMO_ELE_TAG, is_walk_ok);
}
}
}
if (em->selectmode & SCE_SELECT_VERTEX) {
BMVert *v;
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
BM_elem_flag_set(v, BM_ELEM_TAG, BM_elem_flag_test(v, BM_ELEM_SELECT));
} }
BMW_init(&walker, em->bm, limit ? BMW_LOOP_SHELL : BMW_VERT_SHELL,
BMW_MASK_NOP, limit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
BMW_FLAG_TEST_HIDDEN,
BMW_NIL_LAY);
if (limit) { if (limit) {
/* grr, shouldn't need to alloc BMO flags here */ BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
BM_mesh_elem_toolflags_ensure(bm); if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { BMLoop *l_walk;
BMO_elem_flag_set(bm, e, BMO_ELE_TAG, !BM_elem_flag_test(e, BM_ELEM_SEAM)); BMW_ITER (l_walk, &walker, v) {
BM_vert_select_set(em->bm, l_walk->v, true);
BM_elem_flag_disable(l_walk->v, BM_ELEM_TAG);
}
}
} }
} }
else {
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
BMEdge *e_walk;
BMW_ITER (e_walk, &walker, v) {
BM_edge_select_set(em->bm, e_walk, true);
BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
}
}
}
}
BMW_end(&walker);
EDBM_selectmode_flush(em);
}
else if (em->selectmode & SCE_SELECT_EDGE) {
BMEdge *e;
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
}
BMW_init(&walker, em->bm, limit ? BMW_LOOP_SHELL : BMW_VERT_SHELL,
BMW_MASK_NOP, limit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
BMW_FLAG_TEST_HIDDEN,
BMW_NIL_LAY);
if (limit) {
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
BMLoop *l_walk;
BMW_ITER (l_walk, &walker, e) {
BM_edge_select_set(em->bm, l_walk->e, true);
BM_edge_select_set(em->bm, l_walk->prev->e, true);
BM_elem_flag_disable(l_walk->e, BM_ELEM_TAG);
}
}
}
}
else {
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
BMEdge *e_walk;
BMW_ITER (e_walk, &walker, e) {
BM_edge_select_set(em->bm, e_walk, true);
BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
}
}
}
}
BMW_end(&walker);
EDBM_selectmode_flush(em);
}
else {
BMFace *f;
BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
BM_elem_flag_set(f, BM_ELEM_TAG, BM_elem_flag_test(f, BM_ELEM_SELECT));
}
BMW_init(&walker, bm, BMW_ISLAND, BMW_init(&walker, bm, BMW_ISLAND,
BMW_MASK_NOP, limit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, limit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
BMW_FLAG_TEST_HIDDEN, BMW_FLAG_TEST_HIDDEN,
BMW_NIL_LAY); BMW_NIL_LAY);
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { if (BM_elem_flag_test(f, BM_ELEM_TAG)) {
for (efa = BMW_begin(&walker, efa); efa; efa = BMW_step(&walker)) { BMFace *f_walk;
BM_face_select_set(bm, efa, true); BMW_ITER (f_walk, &walker, f) {
BM_elem_flag_disable(efa, BM_ELEM_TAG); BM_face_select_set(bm, f_walk, true);
BM_elem_flag_disable(f_walk, BM_ELEM_TAG);
} }
} }
} }
BMW_end(&walker);
if (limit) { BMW_end(&walker);
BM_mesh_elem_toolflags_clear(bm);
}
} }
else {
BMVert *v;
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (limit) {
BM_elem_flag_set(v, BM_ELEM_TAG, BM_elem_flag_test(v, BM_ELEM_SELECT)); BM_mesh_elem_toolflags_clear(bm);
}
BMW_init(&walker, em->bm, BMW_VERT_SHELL,
BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
BMW_FLAG_TEST_HIDDEN,
BMW_NIL_LAY);
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
for (e = BMW_begin(&walker, v); e; e = BMW_step(&walker)) {
BM_edge_select_set(em->bm, e, true);
BM_elem_flag_disable(e, BM_ELEM_TAG);
}
}
}
BMW_end(&walker);
EDBM_selectmode_flush(em);
} }
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit);