diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-19 17:35:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-19 17:47:31 +0300 |
commit | 92ea28101725631f8ebe6c6cfd37007175f1af03 (patch) | |
tree | 2bb078b2f4f1c72a9e7dace2aa07d8185c8c4a29 /source/blender/editors | |
parent | d2b03d23647197f933d7afdeb53da35ed074bf94 (diff) |
Cleanup: remove BKE_utildefines
This was meant to be used for less general macros but was never used.
Rename BKE_BIT_TEST_SET to SET_FLAG_FROM_TEST
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/editface.c | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 6c6c106b19a..4336fff45d5 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -42,7 +42,6 @@ #include "BKE_mesh.h" #include "BKE_context.h" #include "BKE_editmesh.h" -#include "BKE_utildefines.h" #include "BIF_gl.h" @@ -231,7 +230,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++) { if (BLI_BITMAP_TEST(poly_tag, a)) { - BKE_BIT_TEST_SET(mp->flag, select, ME_FACE_SEL); + SET_FLAG_FROM_TEST(mp->flag, select, ME_FACE_SEL); } } diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index ac8d438d9e6..57053ddc020 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -57,7 +57,6 @@ #include "BKE_lattice.h" #include "BKE_deform.h" #include "BKE_report.h" -#include "BKE_utildefines.h" #include "ED_lattice.h" #include "ED_object.h" @@ -369,7 +368,7 @@ static int lattice_select_more_less(bContext *C, const bool select) lattice_test_bitmap_uvw(lt, selpoints, u, v, w + 1, select) || lattice_test_bitmap_uvw(lt, selpoints, u, v, w - 1, select)) { - BKE_BIT_TEST_SET(bp->f1, select, SELECT); + SET_FLAG_FROM_TEST(bp->f1, select, SELECT); } } bp++; diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 67597729d15..05cf552e5cc 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -70,8 +70,6 @@ #include "BKE_paint.h" #include "BKE_editmesh.h" #include "BKE_tracking.h" -#include "BKE_utildefines.h" - #include "BIF_gl.h" #include "BIF_glutil.h" @@ -726,7 +724,7 @@ static void do_lasso_select_meshobject__doSelectVert(void *userData, MVert *mv, if (BLI_rctf_isect_pt_v(data->rect_fl, screen_co) && BLI_lasso_is_point_inside(data->mcords, data->moves, screen_co[0], screen_co[1], IS_CLIPPED)) { - BKE_BIT_TEST_SET(mv->flag, data->select, SELECT); + SET_FLAG_FROM_TEST(mv->flag, data->select, SELECT); } } static void do_lasso_select_paintvert(ViewContext *vc, const int mcords[][2], short moves, bool extend, bool select) @@ -1672,7 +1670,7 @@ static void do_paintvert_box_select__doSelectVert(void *userData, MVert *mv, con BoxSelectUserData *data = userData; if (BLI_rctf_isect_pt_v(data->rect_fl, screen_co)) { - BKE_BIT_TEST_SET(mv->flag, data->select, SELECT); + SET_FLAG_FROM_TEST(mv->flag, data->select, SELECT); } } static int do_paintvert_box_select(ViewContext *vc, rcti *rect, bool select, bool extend) @@ -2498,7 +2496,7 @@ static void paint_vertsel_circle_select_doSelectVert(void *userData, MVert *mv, CircleSelectUserData *data = userData; if (len_squared_v2v2(data->mval_fl, screen_co) <= data->radius_squared) { - BKE_BIT_TEST_SET(mv->flag, data->select, SELECT); + SET_FLAG_FROM_TEST(mv->flag, data->select, SELECT); } } static void paint_vertsel_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 179b68dd270..277e01d1e2b 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -82,7 +82,6 @@ #include "BKE_editmesh.h" #include "BKE_tracking.h" #include "BKE_mask.h" -#include "BKE_utildefines.h" #include "ED_anim_api.h" #include "ED_armature.h" @@ -1208,7 +1207,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve if (prop_id && (prop = RNA_struct_find_property(op->ptr, prop_id)) && RNA_property_is_set(op->ptr, prop)) { - BKE_BIT_TEST_SET(t->flag, RNA_property_boolean_get(op->ptr, prop), T_ALT_TRANSFORM); + SET_FLAG_FROM_TEST(t->flag, RNA_property_boolean_get(op->ptr, prop), T_ALT_TRANSFORM); } } |