[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45022] trunk/blender/source/blender: rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 20 09:42:37 CET 2012
Revision: 45022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45022
Author: campbellbarton
Date: 2012-03-20 08:42:26 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/blenlib/intern/voxel.c
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_inline.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
trunk/blender/source/blender/bmesh/intern/bmesh_operator_api_inline.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -2854,12 +2854,12 @@
*/
-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;
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -437,7 +437,7 @@
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, '.', ' ', '-', '_');
}
Modified: trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -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;
}
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2012-03-20 08:42:26 UTC (rev 45022)
@@ -251,12 +251,12 @@
/*little macro so inline keyword works*/
#if defined(_MSC_VER)
-# define BM_INLINE static __forceinline
+# define BLI_INLINE static __forceinline
#elif defined(__GNUC__)
-# define BM_INLINE static inline __attribute((always_inline))
+# define BLI_INLINE static inline __attribute((always_inline))
#else
/* #warning "MSC/GNUC defines not found, inline non-functional" */
-# define BM_INLINE static
+# define BLI_INLINE static
#endif
Modified: trunk/blender/source/blender/blenlib/intern/voxel.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/voxel.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/blenlib/intern/voxel.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -35,7 +35,7 @@
-BM_INLINE float D(float *data, const int res[3], int x, int y, int z)
+BLI_INLINE float D(float *data, const int res[3], int x, int y, int z)
{
CLAMP(x, 0, res[0]-1);
CLAMP(y, 0, res[1]-1);
@@ -57,7 +57,7 @@
}
// returns highest integer <= x as integer (slightly faster than floor())
-BM_INLINE int FLOORI(float x)
+BLI_INLINE int FLOORI(float x)
{
const int r = (int)x;
return ((x >= 0.f) || (float)r == x) ? r : (r - 1);
@@ -65,7 +65,7 @@
// clamp function, cannot use the CLAMPIS macro, it sometimes returns unwanted results apparently related to gcc optimization flag -fstrict-overflow which is enabled at -O2
// this causes the test (x + 2) < 0 with int x == 2147483647 to return false (x being an integer, x + 2 should wrap around to -2147483647 so the test < 0 should return true, which it doesn't)
-BM_INLINE int _clamp(int a, int b, int c)
+BLI_INLINE int _clamp(int a, int b, int c)
{
return (a < b) ? b : ((a > c) ? c : a);
}
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-03-20 08:42:26 UTC (rev 45022)
@@ -219,12 +219,12 @@
#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 @@
#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)
Modified: trunk/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-20 08:42:26 UTC (rev 45022)
@@ -81,11 +81,11 @@
#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.*/
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -240,7 +240,7 @@
* 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;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_inline.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_inline.c 2012-03-20 08:23:53 UTC (rev 45021)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_inline.c 2012-03-20 08:42:26 UTC (rev 45022)
@@ -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;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list