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/DerivedMesh.c | |
| parent | a0ea68a584a5d12bad08632f867e921ea781f3af (diff) | |
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
1 files changed, 2 insertions, 2 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; |