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_reader_mesh.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/abc_reader_mesh.cc')
| -rw-r--r-- | source/blender/io/alembic/intern/abc_reader_mesh.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index a37ac84bdfb..756dde3783c 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -32,6 +32,7 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BLI_compiler_compat.h" #include "BLI_math_geom.h" #include "BKE_main.h" @@ -343,7 +344,7 @@ static void process_normals(CDStreamConfig &config, } } -ABC_INLINE void read_uvs_params(CDStreamConfig &config, +BLI_INLINE void read_uvs_params(CDStreamConfig &config, AbcMeshData &abc_data, const IV2fGeomParam &uv, const ISampleSelector &selector) @@ -718,7 +719,7 @@ void AbcMeshReader::readFaceSetsSample(Main *bmain, Mesh *mesh, const ISampleSel /* ************************************************************************** */ -ABC_INLINE MEdge *find_edge(MEdge *edges, int totedge, int v1, int v2) +BLI_INLINE MEdge *find_edge(MEdge *edges, int totedge, int v1, int v2) { for (int i = 0, e = totedge; i < e; i++) { MEdge &edge = edges[i]; |