forked from bartvdbraak/blender
BMesh Walker: rename BMW_SHELL -> BMW_VERT_SHELL
This commit is contained in:
parent
d82cd4d5ef
commit
7e78322eef
@ -107,7 +107,7 @@ void BMW_reset(BMWalker *walker);
|
||||
*/
|
||||
|
||||
enum {
|
||||
BMW_SHELL,
|
||||
BMW_VERT_SHELL,
|
||||
BMW_LOOP,
|
||||
BMW_FACELOOP,
|
||||
BMW_EDGERING,
|
||||
|
@ -98,7 +98,7 @@ static bool bmw_mask_check_face(BMWalker *walker, BMFace *f)
|
||||
*
|
||||
* \todo Add restriction flag/callback for wire edges.
|
||||
*/
|
||||
static void bmw_ShellWalker_visitEdge(BMWalker *walker, BMEdge *e)
|
||||
static void bmw_VertShellWalker_visitEdge(BMWalker *walker, BMEdge *e)
|
||||
{
|
||||
BMwShellWalker *shellWalk = NULL;
|
||||
|
||||
@ -115,7 +115,7 @@ static void bmw_ShellWalker_visitEdge(BMWalker *walker, BMEdge *e)
|
||||
BLI_gset_insert(walker->visit_set, e);
|
||||
}
|
||||
|
||||
static void bmw_ShellWalker_begin(BMWalker *walker, void *data)
|
||||
static void bmw_VertShellWalker_begin(BMWalker *walker, void *data)
|
||||
{
|
||||
BMIter eiter;
|
||||
BMHeader *h = data;
|
||||
@ -133,7 +133,7 @@ static void bmw_ShellWalker_begin(BMWalker *walker, void *data)
|
||||
* to the worklist */
|
||||
v = (BMVert *)h;
|
||||
BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
|
||||
bmw_ShellWalker_visitEdge(walker, e);
|
||||
bmw_VertShellWalker_visitEdge(walker, e);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -143,7 +143,7 @@ static void bmw_ShellWalker_begin(BMWalker *walker, void *data)
|
||||
/* starting the walk at an edge, add the single edge
|
||||
* to the worklist */
|
||||
e = (BMEdge *)h;
|
||||
bmw_ShellWalker_visitEdge(walker, e);
|
||||
bmw_VertShellWalker_visitEdge(walker, e);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@ -151,13 +151,13 @@ static void bmw_ShellWalker_begin(BMWalker *walker, void *data)
|
||||
}
|
||||
}
|
||||
|
||||
static void *bmw_ShellWalker_yield(BMWalker *walker)
|
||||
static void *bmw_VertShellWalker_yield(BMWalker *walker)
|
||||
{
|
||||
BMwShellWalker *shellWalk = BMW_current_state(walker);
|
||||
return shellWalk->curedge;
|
||||
}
|
||||
|
||||
static void *bmw_ShellWalker_step(BMWalker *walker)
|
||||
static void *bmw_VertShellWalker_step(BMWalker *walker)
|
||||
{
|
||||
BMwShellWalker *swalk, owalk;
|
||||
BMEdge *e, *e2;
|
||||
@ -173,7 +173,7 @@ static void *bmw_ShellWalker_step(BMWalker *walker)
|
||||
for (i = 0; i < 2; i++) {
|
||||
v = i ? e->v2 : e->v1;
|
||||
BM_ITER_ELEM (e2, &iter, v, BM_EDGES_OF_VERT) {
|
||||
bmw_ShellWalker_visitEdge(walker, e2);
|
||||
bmw_VertShellWalker_visitEdge(walker, e2);
|
||||
}
|
||||
}
|
||||
|
||||
@ -181,7 +181,7 @@ static void *bmw_ShellWalker_step(BMWalker *walker)
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void *bmw_ShellWalker_step(BMWalker *walker)
|
||||
static void *bmw_VertShellWalker_step(BMWalker *walker)
|
||||
{
|
||||
BMEdge *curedge, *next = NULL;
|
||||
BMVert *v_old = NULL;
|
||||
@ -1175,11 +1175,11 @@ static void *bmw_UVEdgeWalker_step(BMWalker *walker)
|
||||
/** \} */
|
||||
|
||||
|
||||
static BMWalker bmw_ShellWalker_Type = {
|
||||
static BMWalker bmw_VertShellWalker_Type = {
|
||||
BM_VERT | BM_EDGE,
|
||||
bmw_ShellWalker_begin,
|
||||
bmw_ShellWalker_step,
|
||||
bmw_ShellWalker_yield,
|
||||
bmw_VertShellWalker_begin,
|
||||
bmw_VertShellWalker_step,
|
||||
bmw_VertShellWalker_yield,
|
||||
sizeof(BMwShellWalker),
|
||||
BMW_BREADTH_FIRST,
|
||||
BM_EDGE, /* valid restrict masks */
|
||||
@ -1266,7 +1266,7 @@ static BMWalker bmw_ConnectedVertexWalker_Type = {
|
||||
};
|
||||
|
||||
BMWalker *bm_walker_types[] = {
|
||||
&bmw_ShellWalker_Type, /* BMW_SHELL */
|
||||
&bmw_VertShellWalker_Type, /* BMW_VERT_SHELL */
|
||||
&bmw_LoopWalker_Type, /* BMW_LOOP */
|
||||
&bmw_FaceLoopWalker_Type, /* BMW_FACELOOP */
|
||||
&bmw_EdgeringWalker_Type, /* BMW_EDGERING */
|
||||
|
@ -389,7 +389,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
|
||||
|
||||
BMO_slot_buffer_flag_enable(bm, op->slots_in, "edges", BM_EDGE, EDGE_MARK);
|
||||
|
||||
BMW_init(&walker, bm, BMW_SHELL,
|
||||
BMW_init(&walker, bm, BMW_VERT_SHELL,
|
||||
BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP,
|
||||
BMW_FLAG_NOP, /* no need to use BMW_FLAG_TEST_HIDDEN, already marked data */
|
||||
BMW_NIL_LAY);
|
||||
|
@ -2039,7 +2039,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
|
||||
BM_elem_flag_set(v, BM_ELEM_TAG, BM_elem_flag_test(v, BM_ELEM_SELECT));
|
||||
}
|
||||
|
||||
BMW_init(&walker, em->bm, BMW_SHELL,
|
||||
BMW_init(&walker, em->bm, BMW_VERT_SHELL,
|
||||
BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
|
||||
BMW_FLAG_TEST_HIDDEN,
|
||||
BMW_NIL_LAY);
|
||||
@ -2157,7 +2157,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
|
||||
eed = eve->e;
|
||||
}
|
||||
|
||||
BMW_init(&walker, bm, BMW_SHELL,
|
||||
BMW_init(&walker, bm, BMW_VERT_SHELL,
|
||||
BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
|
||||
BMW_FLAG_TEST_HIDDEN,
|
||||
BMW_NIL_LAY);
|
||||
@ -2461,7 +2461,7 @@ static void walker_deselect_nth(BMEditMesh *em, int nth, int offset, BMHeader *h
|
||||
break;
|
||||
case BM_EDGE:
|
||||
itertype = BM_EDGES_OF_MESH;
|
||||
walktype = BMW_SHELL;
|
||||
walktype = BMW_VERT_SHELL;
|
||||
flushtype = SCE_SELECT_EDGE;
|
||||
mask_edge = BMO_ELE_TAG;
|
||||
break;
|
||||
|
@ -2783,7 +2783,7 @@ static bool mesh_separate_loose(Main *bmain, Scene *scene, Base *base_old, BMesh
|
||||
|
||||
/* Walk from the single vertex, selecting everything connected
|
||||
* to it */
|
||||
BMW_init(&walker, bm_old, BMW_SHELL,
|
||||
BMW_init(&walker, bm_old, BMW_VERT_SHELL,
|
||||
BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
|
||||
BMW_FLAG_NOP,
|
||||
BMW_NIL_LAY);
|
||||
|
Loading…
Reference in New Issue
Block a user