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/alembic_capi.cc | |
| 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/alembic_capi.cc')
| -rw-r--r-- | source/blender/io/alembic/intern/alembic_capi.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 40dd690301e..0b4b184359b 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -57,6 +57,7 @@ #include "BKE_screen.h" #undef new +#include "BLI_compiler_compat.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_listbase.h" @@ -105,12 +106,12 @@ struct AbcArchiveHandle { int unused; }; -ABC_INLINE ArchiveReader *archive_from_handle(AbcArchiveHandle *handle) +BLI_INLINE ArchiveReader *archive_from_handle(AbcArchiveHandle *handle) { return reinterpret_cast<ArchiveReader *>(handle); } -ABC_INLINE AbcArchiveHandle *handle_from_archive(ArchiveReader *archive) +BLI_INLINE AbcArchiveHandle *handle_from_archive(ArchiveReader *archive) { return reinterpret_cast<AbcArchiveHandle *>(archive); } |