diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-06-25 14:45:45 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-06-25 14:45:45 -0500 |
| commit | 59cad02d19a88411cedbfc6f8ba21e4cf041321d (patch) | |
| tree | 141ae8c7bf6fb4ec6cb9e4cfcef6d87a0e00ebd0 /libre/blender/openvdb3-abi.patch | |
| parent | 4e799a325f85ca8fad0d15f069f5674972a01c23 (diff) | |
| download | abslibre-59cad02d19a88411cedbfc6f8ba21e4cf041321d.tar.gz abslibre-59cad02d19a88411cedbfc6f8ba21e4cf041321d.tar.bz2 abslibre-59cad02d19a88411cedbfc6f8ba21e4cf041321d.zip | |
blender-17:2.79.b.git3.32432d91-1.parabola1: updating version
Diffstat (limited to 'libre/blender/openvdb3-abi.patch')
| -rw-r--r-- | libre/blender/openvdb3-abi.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/blender/openvdb3-abi.patch b/libre/blender/openvdb3-abi.patch new file mode 100644 index 000000000..73c46094d --- /dev/null +++ b/libre/blender/openvdb3-abi.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfea2dd1a97..c59aff4c62c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,6 +252,10 @@ option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPEN + option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) + option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) + ++if(WITH_OPENVDB) ++ add_definitions(-DOPENVDB_3_ABI_COMPATIBLE=TRUE) ++endif() ++ + # GHOST Windowing Library Options + option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) + mark_as_advanced(WITH_GHOST_DEBUG) +diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc +index e886c5a76a8..bedcfe65552 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) || defined(OPENVDB_3_ABI_COMPATIBLE) + m_grids->push_back(grid.copyGrid()); + #else + m_grids->push_back(grid.copyGridWithNewTree()); |