From bf462149a6d0213521b12395e10eb91f02c02326 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Jun 2014 16:05:15 +1000 Subject: BLI_bitmap: rename macros - BLI_BITMAP_SET -> BLI_BITMAP_ENABLE - BLI_BITMAP_CLEAR -> BLI_BITMAP_DISABLE - BLI_BITMAP_GET -> BLI_BITMAP_TEST - BLI_BITMAP_MODIFY -> BLI_BITMAP_SET --- source/blender/editors/curve/editcurve.c | 10 +++++----- source/blender/editors/mesh/editface.c | 12 ++++++------ source/blender/editors/mesh/editmesh_select.c | 8 ++++---- source/blender/editors/object/object_lattice.c | 4 ++-- source/blender/editors/object/object_modifier.c | 4 ++-- source/blender/editors/sculpt_paint/paint_hide.c | 4 ++-- source/blender/editors/sculpt_paint/sculpt.c | 2 +- source/blender/editors/sculpt_paint/sculpt_undo.c | 6 +++--- source/blender/editors/space_view3d/drawmesh.c | 10 +++++----- source/blender/editors/transform/transform_conversions.c | 4 ++-- source/blender/editors/uvedit/uvedit_draw.c | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 0512980ec1f..c7dff3d7787 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -5717,7 +5717,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) bp = nu->bp; selbpoints = BLI_BITMAP_NEW(a, "selectlist"); while (a > 0) { - if ((!BLI_BITMAP_GET(selbpoints, a)) && (bp->hide == 0) && (bp->f1 & SELECT)) { + if ((!BLI_BITMAP_TEST(selbpoints, a)) && (bp->hide == 0) && (bp->f1 & SELECT)) { /* upper control point */ if (a % nu->pntsu != 0) { tempbp = bp - 1; @@ -5730,7 +5730,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) tempbp = bp + nu->pntsu; if (!(tempbp->f1 & SELECT)) sel = select_bpoint(tempbp, SELECT, SELECT, VISIBLE); /* make sure selected bpoint is discarded */ - if (sel == 1) BLI_BITMAP_SET(selbpoints, a - nu->pntsu); + if (sel == 1) BLI_BITMAP_ENABLE(selbpoints, a - nu->pntsu); } /* right control point */ @@ -5814,7 +5814,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) } else { bp--; - if (BLI_BITMAP_GET(selbpoints, a + 1) || ((bp->hide == 0) && (bp->f1 & SELECT))) sel++; + if (BLI_BITMAP_TEST(selbpoints, a + 1) || ((bp->hide == 0) && (bp->f1 & SELECT))) sel++; bp++; } @@ -5832,7 +5832,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) } else { bp -= nu->pntsu; - if (BLI_BITMAP_GET(selbpoints, a + nu->pntsu) || ((bp->hide == 0) && (bp->f1 & SELECT))) sel++; + if (BLI_BITMAP_TEST(selbpoints, a + nu->pntsu) || ((bp->hide == 0) && (bp->f1 & SELECT))) sel++; bp += nu->pntsu; } @@ -5847,7 +5847,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) if (sel != 4) { select_bpoint(bp, DESELECT, SELECT, VISIBLE); - BLI_BITMAP_SET(selbpoints, a); + BLI_BITMAP_ENABLE(selbpoints, a); } } else { diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5150a703951..87b429f1165 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -204,7 +204,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, /* only put face under cursor in array */ mp = &me->mpoly[index]; BKE_mesh_poly_edgebitmap_insert(edge_tag, mp, me->mloop + mp->loopstart); - BLI_BITMAP_SET(poly_tag, index); + BLI_BITMAP_ENABLE(poly_tag, index); } else { /* fill array by selection */ @@ -215,7 +215,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, } else if (mp->flag & ME_FACE_SEL) { BKE_mesh_poly_edgebitmap_insert(edge_tag, mp, me->mloop + mp->loopstart); - BLI_BITMAP_SET(poly_tag, a); + BLI_BITMAP_ENABLE(poly_tag, a); } } } @@ -229,13 +229,13 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, if (mp->flag & ME_HIDE) continue; - if (!BLI_BITMAP_GET(poly_tag, a)) { + if (!BLI_BITMAP_TEST(poly_tag, a)) { mark = false; ml = me->mloop + mp->loopstart; for (b = 0; b < mp->totloop; b++, ml++) { if ((me->medge[ml->e].flag & ME_SEAM) == 0) { - if (BLI_BITMAP_GET(edge_tag, ml->e)) { + if (BLI_BITMAP_TEST(edge_tag, ml->e)) { mark = true; break; } @@ -243,7 +243,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, } if (mark) { - BLI_BITMAP_SET(poly_tag, a); + BLI_BITMAP_ENABLE(poly_tag, a); BKE_mesh_poly_edgebitmap_insert(edge_tag, mp, me->mloop + mp->loopstart); do_it = true; } @@ -254,7 +254,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, MEM_freeN(edge_tag); for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++) { - if (BLI_BITMAP_GET(poly_tag, a)) { + if (BLI_BITMAP_TEST(poly_tag, a)) { BKE_BIT_TEST_SET(mp->flag, select, ME_FACE_SEL); } } diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index f58034c1066..23828098940 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -213,7 +213,7 @@ bool EDBM_backbuf_border_init(ViewContext *vc, short xmin, short ymin, short xma a = (xmax - xmin + 1) * (ymax - ymin + 1); while (a--) { if (*dr > 0 && *dr <= bm_vertoffs) { - BLI_BITMAP_SET(selbuf, *dr); + BLI_BITMAP_ENABLE(selbuf, *dr); } dr++; } @@ -230,7 +230,7 @@ bool EDBM_backbuf_check(unsigned int index) return true; if (index > 0 && index <= bm_vertoffs) - return BLI_BITMAP_GET_BOOL(selbuf, index); + return BLI_BITMAP_TEST_BOOL(selbuf, index); return false; } @@ -297,7 +297,7 @@ bool EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short a = (xmax - xmin + 1) * (ymax - ymin + 1); while (a--) { if (*dr > 0 && *dr <= bm_vertoffs && *dr_mask == true) { - BLI_BITMAP_SET(selbuf, *dr); + BLI_BITMAP_ENABLE(selbuf, *dr); } dr++; dr_mask++; } @@ -340,7 +340,7 @@ bool EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads) for (xc = -rads; xc <= rads; xc++, dr++) { if (xc * xc + yc * yc < radsq) { if (*dr > 0 && *dr <= bm_vertoffs) { - BLI_BITMAP_SET(selbuf, *dr); + BLI_BITMAP_ENABLE(selbuf, *dr); } } } diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 2af2ca3b0e9..3897e452d0d 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -285,7 +285,7 @@ static int lattice_select_mirror_exec(bContext *C, wmOperator *op) const int i_flip = BKE_lattice_index_flip(lt, i, flip_uvw[0], flip_uvw[1], flip_uvw[2]); bp = <->def[i]; if (!bp->hide) { - if (BLI_BITMAP_GET(selpoints, i_flip)) { + if (BLI_BITMAP_TEST(selpoints, i_flip)) { bp->f1 |= SELECT; } else { @@ -338,7 +338,7 @@ static bool lattice_test_bitmap_uvw(Lattice *lt, BLI_bitmap *selpoints, int u, i else { int i = BKE_lattice_index_from_uvw(lt, u, v, w); if (lt->def[i].hide == 0) { - return (BLI_BITMAP_GET(selpoints, i) != 0) == selected; + return (BLI_BITMAP_TEST(selpoints, i) != 0) == selected; } return false; } diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 3e33268704c..1249beb4517 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1650,9 +1650,9 @@ static void skin_armature_bone_create(Object *skin_ob, int v; /* ignore edge if already visited */ - if (BLI_BITMAP_GET(edges_visited, endx)) + if (BLI_BITMAP_TEST(edges_visited, endx)) continue; - BLI_BITMAP_SET(edges_visited, endx); + BLI_BITMAP_ENABLE(edges_visited, endx); v = (e->v1 == parent_v ? e->v2 : e->v1); diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index bc37a88d7f0..d1a7f0032ae 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -192,14 +192,14 @@ static void partialvis_update_grids(Object *ob, /* skip grid element if not in the effected area */ if (is_effected(area, planes, co, mask)) { /* set or clear the hide flag */ - BLI_BITMAP_MODIFY(gh, y * key.grid_size + x, + BLI_BITMAP_SET(gh, y * key.grid_size + x, action == PARTIALVIS_HIDE); any_changed = true; } /* keep track of whether any elements are still hidden */ - if (BLI_BITMAP_GET(gh, y * key.grid_size + x)) + if (BLI_BITMAP_TEST(gh, y * key.grid_size + x)) any_hidden = true; else any_visible = true; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 9324656309b..950e61c7168 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1566,7 +1566,7 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no int index; if (gh) { - if (BLI_BITMAP_GET(gh, y * gridsize + x)) + if (BLI_BITMAP_TEST(gh, y * gridsize + x)) continue; } diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index fa398e3391b..71bd42f4fc4 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -195,9 +195,9 @@ static int sculpt_undo_restore_hidden(bContext *C, DerivedMesh *dm, for (i = 0; i < unode->totvert; i++) { MVert *v = &mvert[unode->index[i]]; - int uval = BLI_BITMAP_GET(unode->vert_hidden, i); + int uval = BLI_BITMAP_TEST(unode->vert_hidden, i); - BLI_BITMAP_MODIFY(unode->vert_hidden, i, + BLI_BITMAP_SET(unode->vert_hidden, i, v->flag & ME_HIDE); if (uval) v->flag |= ME_HIDE; @@ -702,7 +702,7 @@ static void sculpt_undo_store_hidden(Object *ob, SculptUndoNode *unode) BKE_pbvh_node_num_verts(pbvh, node, NULL, &allvert); BKE_pbvh_node_get_verts(pbvh, node, &vert_indices, &mvert); for (i = 0; i < allvert; i++) { - BLI_BITMAP_MODIFY(unode->vert_hidden, i, + BLI_BITMAP_SET(unode->vert_hidden, i, mvert[vert_indices[i]].flag & ME_HIDE); } } diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 56b6b6a89a7..de4011c9349 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -113,8 +113,8 @@ static BLI_bitmap *get_tface_mesh_marked_edge_info(Mesh *me) ml = me->mloop + mp->loopstart; for (j = 0; j < mp->totloop; j++, ml++) { - BLI_BITMAP_SET(bitmap_edge_flags, edge_vis_index(ml->e)); - if (select_set) BLI_BITMAP_SET(bitmap_edge_flags, edge_sel_index(ml->e)); + BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_vis_index(ml->e)); + if (select_set) BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_sel_index(ml->e)); } } } @@ -129,12 +129,12 @@ static DMDrawOption draw_mesh_face_select__setHiddenOpts(void *userData, int ind Mesh *me = data->me; if (me->drawflag & ME_DRAWEDGES) { - if ((me->drawflag & ME_HIDDENEDGES) || (BLI_BITMAP_GET(data->edge_flags, edge_vis_index(index)))) + if ((me->drawflag & ME_HIDDENEDGES) || (BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index)))) return DM_DRAW_OPTION_NORMAL; else return DM_DRAW_OPTION_SKIP; } - else if (BLI_BITMAP_GET(data->edge_flags, edge_sel_index(index))) + else if (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index))) return DM_DRAW_OPTION_NORMAL; else return DM_DRAW_OPTION_SKIP; @@ -143,7 +143,7 @@ static DMDrawOption draw_mesh_face_select__setHiddenOpts(void *userData, int ind static DMDrawOption draw_mesh_face_select__setSelectOpts(void *userData, int index) { drawMeshFaceSelect_userData *data = userData; - return (BLI_BITMAP_GET(data->edge_flags, edge_sel_index(index))) ? DM_DRAW_OPTION_NORMAL : DM_DRAW_OPTION_SKIP; + return (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index))) ? DM_DRAW_OPTION_NORMAL : DM_DRAW_OPTION_SKIP; } /* draws unselected */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 92899fc4116..d582a0c53de 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2623,7 +2623,7 @@ static void createTransUVs(bContext *C, TransInfo *t) if (propconnected) { UvElement *element = BM_uv_element_get(elementmap, efa, l); - BLI_BITMAP_SET(island_enabled, element->island); + BLI_BITMAP_ENABLE(island_enabled, element->island); } } @@ -2664,7 +2664,7 @@ static void createTransUVs(bContext *C, TransInfo *t) if (propconnected) { UvElement *element = BM_uv_element_get(elementmap, efa, l); - if (!BLI_BITMAP_GET(island_enabled, element->island)) { + if (!BLI_BITMAP_TEST(island_enabled, element->island)) { count_rejected++; continue; } diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 7c2f71c0153..a1cc23f735b 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -418,7 +418,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage) Image *image; ED_object_get_active_image(ob, a + 1, &image, NULL, NULL); if (image == curimage) { - BLI_BITMAP_SET(mat_test_array, a); + BLI_BITMAP_ENABLE(mat_test_array, a); ok = true; } } @@ -430,7 +430,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage) for (a = me->totpoly; a != 0; a--, mpoly++) { const int mat_nr = mpoly->mat_nr; if ((mat_nr >= ob->totcol) || - (BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0) + (BLI_BITMAP_TEST(mat_test_array, mat_nr)) == 0) { continue; } -- cgit v1.2.3