diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-06 10:05:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-13 18:47:12 +0400 |
commit | bf462149a6d0213521b12395e10eb91f02c02326 (patch) | |
tree | 21fd955fda46046ad8182c33642baceda64cd8fc /source/blender/editors/object | |
parent | a427fa5261565746b24c626766b7ffcb83712d3c (diff) |
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
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
2 files changed, 4 insertions, 4 deletions
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); |