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/blenkernel/intern | |
parent | a0ea68a584a5d12bad08632f867e921ea781f3af (diff) |
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/navmesh_conversion.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index bf3f461d3f5..68264ddd200 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2854,12 +2854,12 @@ void DM_set_object_boundbox(Object *ob, DerivedMesh *dm) */ -BM_INLINE int navmesh_bit(int a, int b) +BLI_INLINE int navmesh_bit(int a, int b) { return (a & (1 << b)) >> b; } -BM_INLINE void navmesh_intToCol(int i, float col[3]) +BLI_INLINE void navmesh_intToCol(int i, float col[3]) { int r = navmesh_bit(i, 0) + navmesh_bit(i, 3) * 2 + 1; int g = navmesh_bit(i, 1) + navmesh_bit(i, 4) * 2 + 1; diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 6de24856ce8..186a4d41403 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -437,7 +437,7 @@ void defgroup_unique_name(bDeformGroup *dg, Object *ob) BLI_uniquename_cb(defgroup_unique_check, &data, "Group", '.', dg->name, sizeof(dg->name)); } -BM_INLINE int is_char_sep(const char c) +BLI_INLINE int is_char_sep(const char c) { return ELEM4(c, '.', ' ', '-', '_'); } diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c index cdba036a6ae..f14482c4cb3 100644 --- a/source/blender/blenkernel/intern/navmesh_conversion.c +++ b/source/blender/blenkernel/intern/navmesh_conversion.c @@ -44,12 +44,12 @@ #include "recast-capi.h" -BM_INLINE float area2(const float* a, const float* b, const float* c) +BLI_INLINE float area2(const float* a, const float* b, const float* c) { return (b[0] - a[0]) * (c[2] - a[2]) - (c[0] - a[0]) * (b[2] - a[2]); } -BM_INLINE int left(const float* a, const float* b, const float* c) +BLI_INLINE int left(const float* a, const float* b, const float* c) { return area2(a, b, c) < 0; } |