diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh_select.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 249 |
1 files changed, 125 insertions, 124 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 3d0101f962b..449ab45da69 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -74,7 +74,7 @@ /* ****************************** MIRROR **************** */ -void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) +void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, bool extend) { BMVert *v1, *v2; BMIter iter; @@ -88,7 +88,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) } } - EDBM_verts_mirror_cache_begin(em, TRUE); + EDBM_verts_mirror_cache_begin(em, true); if (!extend) EDBM_flag_disable_all(em, BM_ELEM_SELECT); @@ -99,7 +99,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) v2 = EDBM_verts_mirror_get(em, v1); if (v2 && !BM_elem_flag_test(v2, BM_ELEM_HIDDEN)) { - BM_vert_select_set(em->bm, v2, TRUE); + BM_vert_select_set(em->bm, v2, true); } } @@ -124,7 +124,7 @@ void EDBM_automerge(Scene *scene, Object *obedit, int update) BM_ELEM_SELECT, scene->toolsettings->doublimit); if (LIKELY(ok) && update) { - EDBM_update_generic(em, TRUE, TRUE); + EDBM_update_generic(em, true, true); } } } @@ -184,19 +184,19 @@ static void draw_triangulated(const int mcords[][2], const short tot) /* reads rect, and builds selection array for quick lookup */ /* returns if all is OK */ -int EDBM_backbuf_border_init(ViewContext *vc, short xmin, short ymin, short xmax, short ymax) +bool EDBM_backbuf_border_init(ViewContext *vc, short xmin, short ymin, short xmax, short ymax) { struct ImBuf *buf; unsigned int *dr; int a; if (vc->obedit == NULL || vc->v3d->drawtype < OB_SOLID || (vc->v3d->flag & V3D_ZBUF_SELECT) == 0) { - return 0; + return false; } buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax); - if (buf == NULL) return 0; - if (bm_vertoffs == 0) return 0; + if (buf == NULL) return false; + if (bm_vertoffs == 0) return false; dr = buf->rect; @@ -210,7 +210,7 @@ int EDBM_backbuf_border_init(ViewContext *vc, short xmin, short ymin, short xmax dr++; } IMB_freeImBuf(buf); - return 1; + return true; } int EDBM_backbuf_check(unsigned int index) @@ -233,7 +233,7 @@ void EDBM_backbuf_free(void) * - grab again and compare * returns 'OK' */ -int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short tot, short xmin, short ymin, short xmax, short ymax) +bool EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short tot, short xmin, short ymin, short xmax, short ymax) { unsigned int *dr, *drm; struct ImBuf *buf, *bufmask; @@ -242,16 +242,16 @@ int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short /* method in use for face selecting too */ if (vc->obedit == NULL) { if (!(paint_facesel_test(vc->obact) || paint_vertsel_test(vc->obact))) { - return 0; + return false; } } else if (vc->v3d->drawtype < OB_SOLID || (vc->v3d->flag & V3D_ZBUF_SELECT) == 0) { - return 0; + return false; } buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax); - if (buf == NULL) return 0; - if (bm_vertoffs == 0) return 0; + if (buf == NULL) return false; + if (bm_vertoffs == 0) return false; dr = buf->rect; @@ -282,7 +282,7 @@ int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short bufmask = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax); if (bufmask == NULL) { - return 0; /* only when mem alloc fails, go crash somewhere else! */ + return false; /* only when mem alloc fails, go crash somewhere else! */ } else { drm = bufmask->rect; @@ -299,11 +299,11 @@ int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short IMB_freeImBuf(buf); IMB_freeImBuf(bufmask); - return 1; + return true; } /* circle shaped sample area */ -int EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads) +bool EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads) { struct ImBuf *buf; unsigned int *dr; @@ -313,18 +313,18 @@ int EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads) /* method in use for face selecting too */ if (vc->obedit == NULL) { if (!(paint_facesel_test(vc->obact) || paint_vertsel_test(vc->obact))) { - return 0; + return false; } } else if (vc->v3d->drawtype < OB_SOLID || (vc->v3d->flag & V3D_ZBUF_SELECT) == 0) { - return 0; + return false; } xmin = xs - rads; xmax = xs + rads; ymin = ys - rads; ymax = ys + rads; buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax); - if (bm_vertoffs == 0) return 0; - if (buf == NULL) return 0; + if (bm_vertoffs == 0) return false; + if (buf == NULL) return false; dr = buf->rect; @@ -340,7 +340,7 @@ int EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads) } IMB_freeImBuf(buf); - return 1; + return true; } @@ -396,7 +396,7 @@ static unsigned int findnearestvert__backbufIndextest(void *handle, unsigned int * if 0, unselected vertice are given the bias * strict: if 1, the vertice corresponding to the sel parameter are ignored and not just biased */ -BMVert *EDBM_vert_find_nearest(ViewContext *vc, float *r_dist, const short sel, const short strict) +BMVert *EDBM_vert_find_nearest(ViewContext *vc, float *r_dist, const bool sel, const bool strict) { if (vc->v3d->drawtype > OB_WIRE && (vc->v3d->flag & V3D_ZBUF_SELECT)) { float distance; @@ -436,7 +436,7 @@ BMVert *EDBM_vert_find_nearest(ViewContext *vc, float *r_dist, const short sel, data.lastIndex = lastSelectedIndex; data.mval_fl[0] = vc->mval[0]; data.mval_fl[1] = vc->mval[1]; - data.select = sel; + data.select = sel ? BM_ELEM_SELECT : 0; data.dist = *r_dist; data.strict = strict; data.closest = NULL; @@ -482,7 +482,7 @@ static void findnearestedge__doClosest(void *userData, BMEdge *eed, const float vec[1] = eed->v1->co[1] + lambda * (eed->v2->co[1] - eed->v1->co[1]); vec[2] = eed->v1->co[2] + lambda * (eed->v2->co[2] - eed->v1->co[2]); - if (ED_view3d_clipping_test(data->vc.rv3d, vec, TRUE) == 0) { + if (ED_view3d_clipping_test(data->vc.rv3d, vec, true) == 0) { data->dist = distance; data->closest = eed; } @@ -729,14 +729,14 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) EDBM_flag_disable_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, TRUE); + BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true); /* finish the operator */ - if (!EDBM_op_finish(em, &bmop, op, TRUE)) { + if (!EDBM_op_finish(em, &bmop, op, true)) { return OPERATOR_CANCELLED; } - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); /* we succeeded */ return OPERATOR_FINISHED; @@ -770,15 +770,15 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) EDBM_flag_disable_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, TRUE); + BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true); EDBM_selectmode_flush(em); /* finish the operator */ - if (!EDBM_op_finish(em, &bmop, op, TRUE)) { + if (!EDBM_op_finish(em, &bmop, op, true)) { return OPERATOR_CANCELLED; } - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); /* we succeeded */ return OPERATOR_FINISHED; @@ -814,16 +814,16 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) EDBM_flag_disable_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "verts.out", BM_VERT, BM_ELEM_SELECT, TRUE); + BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "verts.out", BM_VERT, BM_ELEM_SELECT, true); /* finish the operator */ - if (!EDBM_op_finish(em, &bmop, op, TRUE)) { + if (!EDBM_op_finish(em, &bmop, op, true)) { return OPERATOR_CANCELLED; } EDBM_selectmode_flush(em); - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); /* we succeeded */ return OPERATOR_FINISHED; @@ -976,9 +976,9 @@ void MESH_OT_select_mode(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - prop = RNA_def_boolean(ot->srna, "use_extend", FALSE, "Extend", ""); + prop = RNA_def_boolean(ot->srna, "use_extend", false, "Extend", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - prop = RNA_def_boolean(ot->srna, "use_expand", FALSE, "Expand", ""); + prop = RNA_def_boolean(ot->srna, "use_expand", false, "Expand", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); ot->prop = prop = RNA_def_enum(ot->srna, "type", elem_items, 0, "Type", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); @@ -990,7 +990,7 @@ void MESH_OT_select_mode(wmOperatorType *ot) /* **************** LOOP SELECTS *************** */ -static void walker_select(BMEditMesh *em, int walkercode, void *start, int select) +static void walker_select(BMEditMesh *em, int walkercode, void *start, const bool select) { BMesh *bm = em->bm; BMElem *ele; @@ -1041,14 +1041,14 @@ static int edbm_loop_multiselect_exec(bContext *C, wmOperator *op) if (looptype) { for (edindex = 0; edindex < totedgesel; edindex += 1) { eed = edarray[edindex]; - walker_select(em, BMW_EDGERING, eed, TRUE); + walker_select(em, BMW_EDGERING, eed, true); } EDBM_selectmode_flush(em); } else { for (edindex = 0; edindex < totedgesel; edindex += 1) { eed = edarray[edindex]; - walker_select(em, BMW_LOOP, eed, TRUE); + walker_select(em, BMW_LOOP, eed, true); } EDBM_selectmode_flush(em); } @@ -1084,12 +1084,12 @@ void MESH_OT_loop_multi_select(wmOperatorType *ot) /* ***************** loop select (non modal) ************** */ -static void mouse_mesh_loop(bContext *C, const int mval[2], short extend, short deselect, short toggle, short ring) +static void mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle, bool ring) { ViewContext vc; BMEditMesh *em; BMEdge *eed; - int select = TRUE; + bool select = true; float dist = 50.0f; float mvalf[2]; @@ -1103,21 +1103,21 @@ static void mouse_mesh_loop(bContext *C, const int mval[2], short extend, short eed = EDBM_edge_find_nearest(&vc, &dist); if (eed) { - if (extend == 0 && deselect == 0 && toggle == 0) { + if (extend == false && deselect == false && toggle == false) { EDBM_flag_disable_all(em, BM_ELEM_SELECT); } if (extend) { - select = TRUE; + select = true; } else if (deselect) { - select = FALSE; + select = false; } else if (BM_elem_flag_test(eed, BM_ELEM_SELECT) == 0) { - select = TRUE; + select = true; } else if (toggle) { - select = FALSE; + select = false; } if (em->selectmode & SCE_SELECT_FACE) { @@ -1208,7 +1208,8 @@ static int edbm_select_loop_invoke(bContext *C, wmOperator *op, const wmEvent *e view3d_operator_needs_opengl(C); - mouse_mesh_loop(C, event->mval, RNA_boolean_get(op->ptr, "extend"), + mouse_mesh_loop(C, event->mval, + RNA_boolean_get(op->ptr, "extend"), RNA_boolean_get(op->ptr, "deselect"), RNA_boolean_get(op->ptr, "toggle"), RNA_boolean_get(op->ptr, "ring")); @@ -1341,15 +1342,15 @@ static int edgetag_context_check(Scene *scene, BMesh *bm, BMEdge *e) { switch (scene->toolsettings->edge_mode) { case EDGE_MODE_SELECT: - return BM_elem_flag_test(e, BM_ELEM_SELECT) ? TRUE : FALSE; + return BM_elem_flag_test(e, BM_ELEM_SELECT) ? true : false; case EDGE_MODE_TAG_SEAM: return BM_elem_flag_test(e, BM_ELEM_SEAM); case EDGE_MODE_TAG_SHARP: return !BM_elem_flag_test(e, BM_ELEM_SMOOTH); case EDGE_MODE_TAG_CREASE: - return BM_elem_float_data_get(&bm->edata, e, CD_CREASE) ? TRUE : FALSE; + return BM_elem_float_data_get(&bm->edata, e, CD_CREASE) ? true : false; case EDGE_MODE_TAG_BEVEL: - return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? TRUE : FALSE; + return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? true : false; } return 0; } @@ -1386,7 +1387,7 @@ static int edgetag_shortest_path(Scene *scene, BMesh *bm, BMEdge *e_src, BMEdge edgetag_ensure_cd_flag(scene, OBACT->data); BM_ITER_MESH_INDEX (e, &eiter, bm, BM_EDGES_OF_MESH, i) { - if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == FALSE) { + if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == false) { BM_elem_flag_disable(e, BM_ELEM_TAG); } else { @@ -1435,14 +1436,14 @@ static int edgetag_shortest_path(Scene *scene, BMesh *bm, BMEdge *e_src, BMEdge } if (e == e_dst) { - short all_set = TRUE; + bool all_set = true; /* Check whether the path is already completely tagged. * if it is, the tags will be cleared instead of set. */ e = e_dst; do { if (!edgetag_context_check(scene, bm, e)) { - all_set = FALSE; + all_set = false; break; } } while ((e = edges_prev[BM_elem_index_get(e)])); @@ -1521,12 +1522,12 @@ static int mouse_mesh_shortest_path_edge(ViewContext *vc) break; } - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -1603,7 +1604,7 @@ static int facetag_shortest_path(Scene *scene, BMesh *bm, BMFace *f_src, BMFace // BM_mesh_elem_index_ensure(bm, BM_VERT /* | BM_EDGE */); // NOT NEEDED FOR FACETAG BM_ITER_MESH_INDEX (f, &fiter, bm, BM_FACES_OF_MESH, i) { - if (BM_elem_flag_test(f, BM_ELEM_HIDDEN) == FALSE) { + if (BM_elem_flag_test(f, BM_ELEM_HIDDEN) == false) { BM_elem_flag_disable(f, BM_ELEM_TAG); } else { @@ -1652,14 +1653,14 @@ static int facetag_shortest_path(Scene *scene, BMesh *bm, BMFace *f_src, BMFace } if (f == f_dst) { - short all_set = TRUE; + bool all_set = true; /* Check whether the path is already completely tagged. * if it is, the tags will be cleared instead of set. */ f = f_dst; do { if (!facetag_context_check(scene, bm, f)) { - all_set = FALSE; + all_set = false; break; } } while ((f = faces_prev[BM_elem_index_get(f)])); @@ -1687,7 +1688,7 @@ static int mouse_mesh_shortest_path_face(ViewContext *vc) f_dst = EDBM_face_find_nearest(vc, &dist); if (f_dst) { int path = 0; - BMFace *f_act = BM_active_face_get(em->bm, FALSE, TRUE); + BMFace *f_act = BM_active_face_get(em->bm, false, true); if (f_act) { if (f_act != f_dst) { @@ -1712,12 +1713,12 @@ static int mouse_mesh_shortest_path_face(ViewContext *vc) BM_active_face_set(em->bm, f_dst); - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -1787,7 +1788,7 @@ void MESH_OT_select_shortest_path(wmOperatorType *ot) /* ************************************************** */ /* here actual select happens */ /* gets called via generic mouse select operator */ -int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselect, short toggle) +bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle) { ViewContext vc; BMVert *eve = NULL; @@ -1802,7 +1803,7 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec if (unified_findnearest(&vc, &eve, &eed, &efa)) { /* Deselect everything */ - if (extend == 0 && deselect == 0 && toggle == 0) + if (extend == false && deselect == false && toggle == false) EDBM_flag_disable_all(vc.em, BM_ELEM_SELECT); if (efa) { @@ -1813,13 +1814,13 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec /* Work-around: deselect first, so we can guarantee it will */ /* be active even if it was already selected */ BM_select_history_remove(vc.em->bm, efa); - BM_face_select_set(vc.em->bm, efa, FALSE); + BM_face_select_set(vc.em->bm, efa, false); BM_select_history_store(vc.em->bm, efa); - BM_face_select_set(vc.em->bm, efa, TRUE); + BM_face_select_set(vc.em->bm, efa, true); } else if (deselect) { BM_select_history_remove(vc.em->bm, efa); - BM_face_select_set(vc.em->bm, efa, FALSE); + BM_face_select_set(vc.em->bm, efa, false); } else { /* set the last selected face */ @@ -1827,11 +1828,11 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_select_history_store(vc.em->bm, efa); - BM_face_select_set(vc.em->bm, efa, TRUE); + BM_face_select_set(vc.em->bm, efa, true); } else if (toggle) { BM_select_history_remove(vc.em->bm, efa); - BM_face_select_set(vc.em->bm, efa, FALSE); + BM_face_select_set(vc.em->bm, efa, false); } } } @@ -1840,22 +1841,22 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec /* Work-around: deselect first, so we can guarantee it will */ /* be active even if it was already selected */ BM_select_history_remove(vc.em->bm, eed); - BM_edge_select_set(vc.em->bm, eed, FALSE); + BM_edge_select_set(vc.em->bm, eed, false); BM_select_history_store(vc.em->bm, eed); - BM_edge_select_set(vc.em->bm, eed, TRUE); + BM_edge_select_set(vc.em->bm, eed, true); } else if (deselect) { BM_select_history_remove(vc.em->bm, eed); - BM_edge_select_set(vc.em->bm, eed, FALSE); + BM_edge_select_set(vc.em->bm, eed, false); } else { if (!BM_elem_flag_test(eed, BM_ELEM_SELECT)) { BM_select_history_store(vc.em->bm, eed); - BM_edge_select_set(vc.em->bm, eed, TRUE); + BM_edge_select_set(vc.em->bm, eed, true); } else if (toggle) { BM_select_history_remove(vc.em->bm, eed); - BM_edge_select_set(vc.em->bm, eed, FALSE); + BM_edge_select_set(vc.em->bm, eed, false); } } } @@ -1864,22 +1865,22 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec /* Work-around: deselect first, so we can guarantee it will */ /* be active even if it was already selected */ BM_select_history_remove(vc.em->bm, eve); - BM_vert_select_set(vc.em->bm, eve, FALSE); + BM_vert_select_set(vc.em->bm, eve, false); BM_select_history_store(vc.em->bm, eve); - BM_vert_select_set(vc.em->bm, eve, TRUE); + BM_vert_select_set(vc.em->bm, eve, true); } else if (deselect) { BM_select_history_remove(vc.em->bm, eve); - BM_vert_select_set(vc.em->bm, eve, FALSE); + BM_vert_select_set(vc.em->bm, eve, false); } else { if (!BM_elem_flag_test(eve, BM_ELEM_SELECT)) { BM_select_history_store(vc.em->bm, eve); - BM_vert_select_set(vc.em->bm, eve, TRUE); + BM_vert_select_set(vc.em->bm, eve, true); } else if (toggle) { BM_select_history_remove(vc.em->bm, eve); - BM_vert_select_set(vc.em->bm, eve, FALSE); + BM_vert_select_set(vc.em->bm, eve, false); } } } @@ -1896,10 +1897,10 @@ int EDBM_select_pick(bContext *C, const int mval[2], short extend, short deselec } WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit); - return 1; + return true; } - return 0; + return false; } static void edbm_strip_selections(BMEditMesh *em) @@ -1951,12 +1952,12 @@ void EDBM_selectmode_set(BMEditMesh *em) else if (em->selectmode & SCE_SELECT_EDGE) { /* deselect vertices, and select again based on edge select */ eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - for (; eve; eve = BM_iter_step(&iter)) BM_vert_select_set(em->bm, eve, FALSE); + for (; eve; eve = BM_iter_step(&iter)) BM_vert_select_set(em->bm, eve, false); eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); for (; eed; eed = BM_iter_step(&iter)) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { - BM_edge_select_set(em->bm, eed, TRUE); + BM_edge_select_set(em->bm, eed, true); } } @@ -1966,12 +1967,12 @@ void EDBM_selectmode_set(BMEditMesh *em) else if (em->selectmode & SCE_SELECT_FACE) { /* deselect eges, and select again based on face select */ eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for (; eed; eed = BM_iter_step(&iter)) BM_edge_select_set(em->bm, eed, FALSE); + for (; eed; eed = BM_iter_step(&iter)) BM_edge_select_set(em->bm, eed, false); efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); for (; efa; efa = BM_iter_step(&iter)) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_face_select_set(em->bm, efa, TRUE); + BM_face_select_set(em->bm, efa, true); } } } @@ -1995,7 +1996,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const s BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { - BM_edge_select_set(em->bm, eed, TRUE); + BM_edge_select_set(em->bm, eed, true); } } } @@ -2007,7 +2008,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const s BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { - BM_face_select_set(em->bm, efa, TRUE); + BM_face_select_set(em->bm, efa, true); } } } @@ -2021,7 +2022,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const s BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { - BM_face_select_set(em->bm, efa, TRUE); + BM_face_select_set(em->bm, efa, true); } } } @@ -2029,13 +2030,13 @@ void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const s } /* user facing function, does notification and undo push */ -int EDBM_selectmode_toggle(bContext *C, const short selectmode_new, - const int action, const int use_extend, const int use_expand) +bool EDBM_selectmode_toggle(bContext *C, const short selectmode_new, + const int action, const bool use_extend, const bool use_expand) { ToolSettings *ts = CTX_data_tool_settings(C); Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = NULL; - int ret = FALSE; + bool ret = false; if (obedit && obedit->type == OB_MESH) { em = BMEdit_FromObject(obedit); @@ -2052,21 +2053,21 @@ int EDBM_selectmode_toggle(bContext *C, const short selectmode_new, case 0: /* disable */ /* check we have something to do */ if ((em->selectmode & selectmode_new) == 0) { - return FALSE; + return false; } em->selectmode &= ~selectmode_new; break; case 1: /* enable */ /* check we have something to do */ if ((em->selectmode & selectmode_new) != 0) { - return FALSE; + return false; } em->selectmode |= selectmode_new; break; case 2: /* toggle */ /* can't disable this flag if its the only one set */ if (em->selectmode == selectmode_new) { - return FALSE; + return false; } em->selectmode ^= selectmode_new; break; @@ -2080,7 +2081,7 @@ int EDBM_selectmode_toggle(bContext *C, const short selectmode_new, em->selectmode = SCE_SELECT_VERTEX; ts->selectmode = em->selectmode; EDBM_selectmode_set(em); - ret = TRUE; + ret = true; break; case SCE_SELECT_EDGE: if (use_extend == 0 || em->selectmode == 0) { @@ -2094,7 +2095,7 @@ int EDBM_selectmode_toggle(bContext *C, const short selectmode_new, } ts->selectmode = em->selectmode; EDBM_selectmode_set(em); - ret = TRUE; + ret = true; break; case SCE_SELECT_FACE: if (use_extend == 0 || em->selectmode == 0) { @@ -2109,14 +2110,14 @@ int EDBM_selectmode_toggle(bContext *C, const short selectmode_new, } ts->selectmode = em->selectmode; EDBM_selectmode_set(em); - ret = TRUE; + ret = true; break; default: BLI_assert(0); break; } - if (ret == TRUE) { + if (ret == true) { WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); WM_main_add_notifier(NC_SCENE | ND_TOOLSETTINGS, NULL); } @@ -2185,25 +2186,25 @@ int EDBM_select_interior_faces(BMEditMesh *em) BMIter eiter; BMFace *efa; BMEdge *eed; - int ok; - int change = FALSE; + bool ok; + bool change = false; BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; - ok = TRUE; + ok = true; BM_ITER_ELEM (eed, &eiter, efa, BM_EDGES_OF_FACE) { if (BM_edge_face_count(eed) < 3) { - ok = FALSE; + ok = false; break; } } if (ok) { - BM_face_select_set(bm, efa, TRUE); - change = TRUE; + BM_face_select_set(bm, efa, true); + change = true; } } @@ -2216,9 +2217,9 @@ static void linked_limit_default(bContext *C, wmOperator *op) Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = BMEdit_FromObject(obedit); if (em->selectmode == SCE_SELECT_FACE) - RNA_boolean_set(op->ptr, "limit", TRUE); + RNA_boolean_set(op->ptr, "limit", true); else - RNA_boolean_set(op->ptr, "limit", FALSE); + RNA_boolean_set(op->ptr, "limit", false); } } @@ -2378,7 +2379,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { for (efa = BMW_begin(&walker, efa); efa; efa = BMW_step(&walker)) { - BM_face_select_set(bm, efa, TRUE); + BM_face_select_set(bm, efa, true); } } } @@ -2560,7 +2561,7 @@ static void walker_deselect_nth(BMEditMesh *em, int nth, int offset, BMHeader *h if (!BM_elem_flag_test(ele, BM_ELEM_TAG)) { /* Deselect elements that aren't at "nth" depth from active */ if ((offset + BMW_current_depth(&walker)) % nth) { - BM_elem_select_set(bm, ele, FALSE); + BM_elem_select_set(bm, ele, false); } BM_elem_flag_enable(ele, BM_ELEM_TAG); } @@ -2619,7 +2620,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed, } } else if (em->selectmode & SCE_SELECT_FACE) { - f = BM_active_face_get(em->bm, TRUE, FALSE); + f = BM_active_face_get(em->bm, true, false); if (f) { *r_efa = f; return; @@ -2666,7 +2667,7 @@ static int edbm_select_nth_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - EDBM_update_generic(em, FALSE, FALSE); + EDBM_update_generic(em, false, false); return OPERATOR_FINISHED; } @@ -2723,14 +2724,14 @@ static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op) const float sharp = RNA_float_get(op->ptr, "sharpness"); BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { - if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == FALSE && + if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == false && BM_edge_loop_pair(e, &l1, &l2)) { /* edge has exactly two neighboring faces, check angle */ const float angle = angle_normalized_v3v3(l1->f->no, l2->f->no); if (fabsf(angle) > sharp) { - BM_edge_select_set(em->bm, e, TRUE); + BM_edge_select_set(em->bm, e, true); } } } @@ -2791,7 +2792,7 @@ static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op) f = stack[i - 1]; i--; - BM_face_select_set(em->bm, f, TRUE); + BM_face_select_set(em->bm, f, true); BM_elem_flag_enable(f, BM_ELEM_TAG); @@ -2867,13 +2868,13 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op) BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN) && !BM_vert_is_manifold(v)) { - BM_vert_select_set(em->bm, v, TRUE); + BM_vert_select_set(em->bm, v, true); } } BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN) && !BM_edge_is_manifold(e)) { - BM_edge_select_set(em->bm, e, TRUE); + BM_edge_select_set(em->bm, e, true); } } @@ -2918,7 +2919,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) if (em->selectmode & SCE_SELECT_VERTEX) { BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_vert_select_set(em->bm, eve, TRUE); + BM_vert_select_set(em->bm, eve, true); } } EDBM_selectmode_flush(em); @@ -2926,7 +2927,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) else if (em->selectmode & SCE_SELECT_EDGE) { BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_edge_select_set(em->bm, eed, TRUE); + BM_edge_select_set(em->bm, eed, true); } } EDBM_selectmode_flush(em); @@ -2934,7 +2935,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) else { BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_face_select_set(em->bm, efa, TRUE); + BM_face_select_set(em->bm, efa, true); } } EDBM_selectmode_flush(em); @@ -3037,14 +3038,14 @@ static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op)) BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) { BM_elem_flag_enable(l->next->v, BM_ELEM_TAG); - BM_vert_select_set(em->bm, l->v, FALSE); + BM_vert_select_set(em->bm, l->v, false); } } } BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_TAG)) { - BM_vert_select_set(em->bm, v, TRUE); + BM_vert_select_set(em->bm, v, true); } } @@ -3076,7 +3077,7 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) BMEdge *e; BMIter iter; - BM_mesh_elem_hflag_disable_all(em->bm, BM_EDGE, BM_ELEM_TAG, FALSE); + BM_mesh_elem_hflag_disable_all(em->bm, BM_EDGE, BM_ELEM_TAG, false); BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { BMLoop *l1, *l2; @@ -3099,7 +3100,7 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_TAG)) { - BM_edge_select_set(em->bm, e, TRUE); + BM_edge_select_set(em->bm, e, true); } } @@ -3290,7 +3291,7 @@ static int edbm_loop_to_region_exec(bContext *C, wmOperator *op) BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { - BM_face_select_set(em->bm, f, TRUE); + BM_face_select_set(em->bm, f, true); } } |