[Bf-blender-cvs] [0d4e519b748] master: OpenVDB: Fix compilation error against OpenVDB 4

[Sergey Sharybin]

Commit: 0d4e519b748c33f3f48fa4dcc4aa31ae398ed13a
Author: Sergey Sharybin
Date:   Mon Sep 25 14:41:30 2017 +0500
Branches: master
https://developer.blender.org/rB0d4e519b748c33f3f48fa4dcc4aa31ae398ed13a

OpenVDB: Fix compilation error against OpenVDB 4

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.

===================================================================

M	intern/openvdb/intern/openvdb_writer.cc

===================================================================

diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc
index 923752909d9..e886c5a76a8 100644
--- a/intern/openvdb/intern/openvdb_writer.cc
+++ b/intern/openvdb/intern/openvdb_writer.cc
@@ -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)