diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 12:42:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 12:42:26 +0400 |
commit | 9dd0c4c232fcdd2e88a2f8ba9391017a8bd55ce3 (patch) | |
tree | 5b86231770d067735ebb61b2b5fe3c099b5ef089 /source/blender/bmesh | |
parent | a0ea68a584a5d12bad08632f867e921ea781f3af (diff) |
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/bmesh.h | 16 | ||||
-rw-r--r-- | source/blender/bmesh/bmesh_operator_api.h | 10 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_inline.c | 16 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators_inline.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api_inline.c | 26 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 4 |
8 files changed, 41 insertions, 41 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 56efe88c104..0cb1f5c051a 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -219,12 +219,12 @@ extern "C" { #define BM_elem_flag_toggle( ele, hflag) _bm_elem_flag_toggle (&(ele)->head, hflag) #define BM_elem_flag_merge( ele_a, ele_b) _bm_elem_flag_merge (&(ele_a)->head, &(ele_b)->head) -BM_INLINE char _bm_elem_flag_test(const BMHeader *head, const char hflag); -BM_INLINE void _bm_elem_flag_enable(BMHeader *head, const char hflag); -BM_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag); -BM_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val); -BM_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag); -BM_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b); +BLI_INLINE char _bm_elem_flag_test(const BMHeader *head, const char hflag); +BLI_INLINE void _bm_elem_flag_enable(BMHeader *head, const char hflag); +BLI_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag); +BLI_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val); +BLI_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag); +BLI_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b); /* notes on BM_elem_index_set(...) usage, * Set index is sometimes abused as temp storage, other times we cant be @@ -257,8 +257,8 @@ BM_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b); #define BM_elem_index_get(ele) _bm_elem_index_get(&(ele)->head) #define BM_elem_index_set(ele, index) _bm_elem_index_set(&(ele)->head, index) -BM_INLINE int _bm_elem_index_get(const BMHeader *ele); -BM_INLINE void _bm_elem_index_set(BMHeader *ele, const int index); +BLI_INLINE int _bm_elem_index_get(const BMHeader *ele); +BLI_INLINE void _bm_elem_index_set(BMHeader *ele, const int index); #ifdef USE_BMESH_HOLES # define BM_FACE_FIRST_LOOP(p) (((BMLoopList *)((p)->loops.first))->first) diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h index c53a76a59d6..84de5d57aa3 100644 --- a/source/blender/bmesh/bmesh_operator_api.h +++ b/source/blender/bmesh/bmesh_operator_api.h @@ -81,11 +81,11 @@ struct GHashIterator; #define BMO_elem_flag_set( bm, ele, oflag, val) _bmo_elem_flag_set (bm, (ele)->oflags, oflag, val) #define BMO_elem_flag_toggle( bm, ele, oflag) _bmo_elem_flag_toggle (bm, (ele)->oflags, oflag) -BM_INLINE short _bmo_elem_flag_test(BMesh *bm, BMFlagLayer *oflags, const short oflag); -BM_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag); -BM_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag); -BM_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val); -BM_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag); +BLI_INLINE short _bmo_elem_flag_test(BMesh *bm, BMFlagLayer *oflags, const short oflag); +BLI_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag); +BLI_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag); +BLI_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val); +BLI_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag); /* slot type arrays are terminated by the last member * having a slot type of 0.*/ diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index c1814b0ae96..6aaa2911bd9 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -240,7 +240,7 @@ BMFace *BM_face_copy(BMesh *bm, BMFace *f, const short copyverts, const short co * only create the face, since this calloc's the length is initialized to 0, * leave adding loops to the caller. */ -BM_INLINE BMFace *bm_face_create__internal(BMesh *bm) +BLI_INLINE BMFace *bm_face_create__internal(BMesh *bm) { BMFace *f; diff --git a/source/blender/bmesh/intern/bmesh_inline.c b/source/blender/bmesh/intern/bmesh_inline.c index f7a0fb5c45c..085488cf7ed 100644 --- a/source/blender/bmesh/intern/bmesh_inline.c +++ b/source/blender/bmesh/intern/bmesh_inline.c @@ -31,44 +31,44 @@ #include "bmesh.h" -BM_INLINE char _bm_elem_flag_test(const BMHeader *head, const char hflag) +BLI_INLINE char _bm_elem_flag_test(const BMHeader *head, const char hflag) { return head->hflag & hflag; } -BM_INLINE void _bm_elem_flag_enable(BMHeader *head, const char hflag) +BLI_INLINE void _bm_elem_flag_enable(BMHeader *head, const char hflag) { head->hflag |= hflag; } -BM_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag) +BLI_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag) { head->hflag &= ~hflag; } -BM_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val) +BLI_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val) { if (val) _bm_elem_flag_enable(head, hflag); else _bm_elem_flag_disable(head, hflag); } -BM_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag) +BLI_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag) { head->hflag ^= hflag; } -BM_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b) +BLI_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b) { head_a->hflag = head_b->hflag = head_a->hflag | head_b->hflag; } -BM_INLINE void _bm_elem_index_set(BMHeader *head, const int index) +BLI_INLINE void _bm_elem_index_set(BMHeader *head, const int index) { head->index = index; } -BM_INLINE int _bm_elem_index_get(const BMHeader *head) +BLI_INLINE int _bm_elem_index_get(const BMHeader *head) { return head->index; } diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.c b/source/blender/bmesh/intern/bmesh_iterators_inline.c index ed65b0e7fac..bb16fcc439c 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.c +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.c @@ -39,7 +39,7 @@ * * Calls an iterators step fucntion to return the next element. */ -BM_INLINE void *BM_iter_step(BMIter *iter) +BLI_INLINE void *BM_iter_step(BMIter *iter) { return iter->step(iter); } @@ -52,7 +52,7 @@ BM_INLINE void *BM_iter_step(BMIter *iter) * it with the appropriate function pointers based * upon its type. */ -BM_INLINE int BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data) +BLI_INLINE int BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data) { /* int argtype; */ iter->itype = itype; @@ -179,7 +179,7 @@ BM_INLINE int BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data * to return the first element of the iterator. * */ -BM_INLINE void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *data) +BLI_INLINE void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *data) { if (LIKELY(BM_iter_init(iter, bm, itype, data))) { return BM_iter_step(iter); diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index b10e25a318c..476c049c687 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -407,7 +407,7 @@ static BMVert **bm_to_mesh_vertex_map(BMesh *bm, int ototvert) return vertMap; } -BM_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e) +BLI_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e) { /* this is a cheap way to set the edge draw, its not precise and will * pick the first 2 faces an edge uses */ diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.c b/source/blender/bmesh/intern/bmesh_operator_api_inline.c index 5b88d9f1b96..91fc3b1e4ca 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.c +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.c @@ -41,39 +41,39 @@ * ghash or a mapping slot to do it. */ /* flags 15 and 16 (1 << 14 and 1 << 15) are reserved for bmesh api use */ -BM_INLINE short _bmo_elem_flag_test(BMesh *bm, BMFlagLayer *oflags, const short oflag) +BLI_INLINE short _bmo_elem_flag_test(BMesh *bm, BMFlagLayer *oflags, const short oflag) { return oflags[bm->stackdepth - 1].f & oflag; } -BM_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag) +BLI_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag) { oflags[bm->stackdepth - 1].f |= oflag; } -BM_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag) +BLI_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag) { oflags[bm->stackdepth - 1].f &= ~oflag; } -BM_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val) +BLI_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val) { if (val) oflags[bm->stackdepth - 1].f |= oflag; else oflags[bm->stackdepth - 1].f &= ~oflag; } -BM_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag) +BLI_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag) { oflags[bm->stackdepth - 1].f ^= oflag; } -BM_INLINE void BMO_slot_map_int_insert(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE void BMO_slot_map_int_insert(BMesh *bm, BMOperator *op, const char *slotname, void *element, int val) { BMO_slot_map_insert(bm, op, slotname, element, &val, sizeof(int)); } -BM_INLINE void BMO_slot_map_float_insert(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE void BMO_slot_map_float_insert(BMesh *bm, BMOperator *op, const char *slotname, void *element, float val) { BMO_slot_map_insert(bm, op, slotname, element, &val, sizeof(float)); @@ -85,13 +85,13 @@ BM_INLINE void BMO_slot_map_float_insert(BMesh *bm, BMOperator *op, const char * * do NOT use these for non-operator-api-allocated memory! instead * use BMO_slot_map_data_get and BMO_slot_map_insert, which copies the data. */ -BM_INLINE void BMO_slot_map_ptr_insert(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE void BMO_slot_map_ptr_insert(BMesh *bm, BMOperator *op, const char *slotname, void *element, void *val) { BMO_slot_map_insert(bm, op, slotname, element, &val, sizeof(void *)); } -BM_INLINE int BMO_slot_map_contains(BMesh *UNUSED(bm), BMOperator *op, const char *slotname, void *element) +BLI_INLINE int BMO_slot_map_contains(BMesh *UNUSED(bm), BMOperator *op, const char *slotname, void *element) { BMOpSlot *slot = BMO_slot_get(op, slotname); BLI_assert(slot->slottype == BMO_OP_SLOT_MAPPING); @@ -102,7 +102,7 @@ BM_INLINE int BMO_slot_map_contains(BMesh *UNUSED(bm), BMOperator *op, const cha return BLI_ghash_haskey(slot->data.ghash, element); } -BM_INLINE void *BMO_slot_map_data_get(BMesh *UNUSED(bm), BMOperator *op, const char *slotname, +BLI_INLINE void *BMO_slot_map_data_get(BMesh *UNUSED(bm), BMOperator *op, const char *slotname, void *element) { BMOElemMapping *mapping; @@ -119,7 +119,7 @@ BM_INLINE void *BMO_slot_map_data_get(BMesh *UNUSED(bm), BMOperator *op, const c return mapping + 1; } -BM_INLINE float BMO_slot_map_float_get(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE float BMO_slot_map_float_get(BMesh *bm, BMOperator *op, const char *slotname, void *element) { float *val = (float *) BMO_slot_map_data_get(bm, op, slotname, element); @@ -128,7 +128,7 @@ BM_INLINE float BMO_slot_map_float_get(BMesh *bm, BMOperator *op, const char *sl return 0.0f; } -BM_INLINE int BMO_slot_map_int_get(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE int BMO_slot_map_int_get(BMesh *bm, BMOperator *op, const char *slotname, void *element) { int *val = (int *) BMO_slot_map_data_get(bm, op, slotname, element); @@ -137,7 +137,7 @@ BM_INLINE int BMO_slot_map_int_get(BMesh *bm, BMOperator *op, const char *slotna return 0; } -BM_INLINE void *BMO_slot_map_ptr_get(BMesh *bm, BMOperator *op, const char *slotname, +BLI_INLINE void *BMO_slot_map_ptr_get(BMesh *bm, BMOperator *op, const char *slotname, void *element) { void **val = (void **) BMO_slot_map_data_get(bm, op, slotname, element); diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 459b1cbb3a7..7db29501ed5 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -76,7 +76,7 @@ static int count_edge_faces(BMesh *bm, BMEdge *e); /**** rotation system code * */ -BM_INLINE BMDiskLink *rs_edge_link_get(BMEdge *e, BMVert *v, EdgeData *e_data) +BLI_INLINE BMDiskLink *rs_edge_link_get(BMEdge *e, BMVert *v, EdgeData *e_data) { return v == ((BMEdge *)e)->v1 ? &(((EdgeData *)e_data)->v1_disk_link) : &(((EdgeData *)e_data)->v2_disk_link) ; @@ -866,7 +866,7 @@ static int count_edge_faces(BMesh *bm, BMEdge *e) return i; } -BM_INLINE void vote_on_winding(BMEdge *edge, EPathNode *node, unsigned int winding[2]) +BLI_INLINE void vote_on_winding(BMEdge *edge, EPathNode *node, unsigned int winding[2]) { BMVert *test_v1, *test_v2; /* we want to use the reverse winding to the existing order */ |