diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-06-19 18:05:11 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-06-19 18:08:21 +0300 |
| commit | 71363dd79c49e0ebd656d5eb61ae5ccb62ece499 (patch) | |
| tree | d1a00e4db2dba33cf8ee3e7c7c937205858de4df /source/blender/io/alembic/intern/abc_axis_conversion.h | |
| parent | f84414d6e14c42bf0f96b128c35d29bc2da59087 (diff) | |
Cleanup: Alembic, replace `ABC_INLINE` with `BLI_INLINE`
The `ABC_INLINE` macro has been in the Alembic code since it was introduced
to Blender in rB61050f75b13e. It basically does the same a `BLI_INLINE`,
though, so there is no need to keep it around.
Diffstat (limited to 'source/blender/io/alembic/intern/abc_axis_conversion.h')
| -rw-r--r-- | source/blender/io/alembic/intern/abc_axis_conversion.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.h b/source/blender/io/alembic/intern/abc_axis_conversion.h index 734c5ca01c9..9a19e9116be 100644 --- a/source/blender/io/alembic/intern/abc_axis_conversion.h +++ b/source/blender/io/alembic/intern/abc_axis_conversion.h @@ -22,13 +22,9 @@ * \ingroup Alembic */ -struct Object; +#include "BLI_compiler_compat.h" -#ifdef _MSC_VER -# define ABC_INLINE static __forceinline -#else -# define ABC_INLINE static inline -#endif +struct Object; namespace blender { namespace io { @@ -41,7 +37,7 @@ namespace alembic { /* Copy from Y-up to Z-up. */ -ABC_INLINE void copy_zup_from_yup(float zup[3], const float yup[3]) +BLI_INLINE void copy_zup_from_yup(float zup[3], const float yup[3]) { const float old_yup1 = yup[1]; /* in case zup == yup */ zup[0] = yup[0]; @@ -49,7 +45,7 @@ ABC_INLINE void copy_zup_from_yup(float zup[3], const float yup[3]) zup[2] = old_yup1; } -ABC_INLINE void copy_zup_from_yup(short zup[3], const short yup[3]) +BLI_INLINE void copy_zup_from_yup(short zup[3], const short yup[3]) { const short old_yup1 = yup[1]; /* in case zup == yup */ zup[0] = yup[0]; @@ -59,7 +55,7 @@ ABC_INLINE void copy_zup_from_yup(short zup[3], const short yup[3]) /* Copy from Z-up to Y-up. */ -ABC_INLINE void copy_yup_from_zup(float yup[3], const float zup[3]) +BLI_INLINE void copy_yup_from_zup(float yup[3], const float zup[3]) { const float old_zup1 = zup[1]; /* in case yup == zup */ yup[0] = zup[0]; @@ -67,7 +63,7 @@ ABC_INLINE void copy_yup_from_zup(float yup[3], const float zup[3]) yup[2] = -old_zup1; } -ABC_INLINE void copy_yup_from_zup(short yup[3], const short zup[3]) +BLI_INLINE void copy_yup_from_zup(short yup[3], const short zup[3]) { const short old_zup1 = zup[1]; /* in case yup == zup */ yup[0] = zup[0]; |