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/bmesh.h | |
| parent | a0ea68a584a5d12bad08632f867e921ea781f3af (diff) | |
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Diffstat (limited to 'source/blender/bmesh/bmesh.h')
| -rw-r--r-- | source/blender/bmesh/bmesh.h | 16 |
1 files changed, 8 insertions, 8 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) |