diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /source/blender/io/alembic/intern/abc_axis_conversion.h | |
parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'source/blender/io/alembic/intern/abc_axis_conversion.h')
-rw-r--r-- | source/blender/io/alembic/intern/abc_axis_conversion.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.h b/source/blender/io/alembic/intern/abc_axis_conversion.h index 7fde0e92ea4..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,13 @@ * \ingroup Alembic */ +#include "BLI_compiler_compat.h" + struct Object; -#ifdef _MSC_VER -# define ABC_INLINE static __forceinline -#else -# define ABC_INLINE static inline -#endif +namespace blender { +namespace io { +namespace alembic { /* TODO(kevin): for now keeping these transformations hardcoded to make sure * everything works properly, and also because Alembic is almost exclusively @@ -37,7 +37,7 @@ struct Object; /* 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]; @@ -45,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]; @@ -55,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]; @@ -63,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]; @@ -97,3 +97,7 @@ void create_transform_matrix(Object *obj, float r_transform_mat[4][4], AbcMatrixMode mode, Object *proxy_from); + +} // namespace alembic +} // namespace io +} // namespace blender
\ No newline at end of file |