diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-29 08:20:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-29 08:21:35 +0300 |
| commit | ca5f3dd2200725712a665705fc25e20a208d6295 (patch) | |
| tree | b178c85b6decaf8c7a3bade4c66ac296f6641c75 /intern/openvdb | |
| parent | 52302757cd9eec2213ed6d3df66728755b30120d (diff) | |
Fix T54457: build error with OpenVDB versions newer than 3.
Solution provided by Sven-Hendrik Haase.
Diffstat (limited to 'intern/openvdb')
| -rw-r--r-- | intern/openvdb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/openvdb/intern/openvdb_writer.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt index e0ecdb52929..4b872f25d45 100644 --- a/intern/openvdb/CMakeLists.txt +++ b/intern/openvdb/CMakeLists.txt @@ -38,6 +38,7 @@ set(SRC if(WITH_OPENVDB) add_definitions( -DWITH_OPENVDB + -DOPENVDB_3_ABI_COMPATIBLE ) list(APPEND INC_SYS diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc index e886c5a76a8..b83691ac7de 100644 --- a/intern/openvdb/intern/openvdb_writer.cc +++ b/intern/openvdb/intern/openvdb_writer.cc @@ -45,7 +45,7 @@ void OpenVDBWriter::insert(const openvdb::GridBase::Ptr &grid) void OpenVDBWriter::insert(const openvdb::GridBase &grid) { -#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3) +#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3) m_grids->push_back(grid.copyGrid()); #else m_grids->push_back(grid.copyGridWithNewTree()); |