blender/blender
blender/blender
188
601
Fork 927
Code Issues 6.3k Pull Requests 1.1k Projects 22 Wiki Activity

OpenVDB: Fix compilation error against OpenVDB 4

Browse Source 
One crucial thing here: OpenVDB shoudl be compiled WITHOUT
OPENVDB_ENABLE_3_ABI_COMPATIBLE flag. This is how OpenVDB's Makefile is
configured and it's not really possible to detect this for a compiled library.

If we ever want to support that option, we need to add extra CMake argument and
use old version 3 API everywhere.
This commit is contained in:
Sergey Sharybin 2017-09-25 14:41:30 +05:00
parent 1d8aebaa09
commit 0d4e519b74
Notes: blender-bot 2025-02-14 01:31:56 +00:00 
Referenced by issue #53683, 2.79a release
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/openvdb/intern/openvdb_writer.cc
View File

@ -45,7 +45,11 @@ void OpenVDBWriter::insert(const openvdb::GridBase::Ptr &grid)
void OpenVDBWriter::insert(const openvdb::GridBase &grid)
{
#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3)
m_grids->push_back(grid.copyGrid());
#else
m_grids->push_back(grid.copyGridWithNewTree());
#endif
}
void OpenVDBWriter::insertFloatMeta(const openvdb::Name &name, const float value)