VDBObject bindings : Adapt for OpenVDB 10.1

OpenVDB 10.1 switched from Boost to PyBind11 for its bindings, so we need to bind VDBObject differently based on which version of OpenVDB we're building for. But with the new PyBindConverter class, the new bindings actually come out simpler than the old ones.

Author: johnhaddon

Changes

@@ -15,6 +15,7 @@ Fixes
 -----
 
 - CompoundObject : Fixed crashes in Python bindings caused by passing `None` as a key.
+- VDBObject : Fixed Python bindings for OpenVDB 10.1.
 
 10.5.4.2 (relative to 10.5.4.1)
 ========

src/IECoreVDB/bindings/IECoreVDBModule.cpp

@@ -41,10 +41,19 @@
 
 #include "IECoreVDB/VDBObject.h"
 
+// OpenVDB 10.0 and earlier used `boost::python` for its Python bindings, but
+// this was switched to PyBind11 in OpenVDB 10.1. We need to take a different
+// approach to binding VDBObject's grid accessors in each case.
+#if OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER > 10 || OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 10 && OPENVDB_LIBRARY_MINOR_VERSION_NUMBER >= 1
+#include "IECorePython/PyBindConverter.h"
+#define IECOREVDB_USE_PYBIND
+#endif
 
 using namespace boost::python;
 using namespace IECoreVDB;
 
+#ifndef IECOREVDB_USE_PYBIND
+
 namespace
 {
 
@@ -118,18 +127,6 @@ openvdb::GridBase::Ptr getGridFromPyObject( const boost::python::object &gridObj
 
 } // namespace iepyopenvdb
 
-
-boost::python::list gridNames( VDBObject::Ptr vdbObject )
-{
-	boost::python::list result;
-	std::vector<std::string> names = vdbObject->gridNames();
-	for( const auto &name : names )
-	{
-		result.append( name );
-	}
-	return result;
-}
-
 boost::python::object findGrid( VDBObject::Ptr vdbObject, const std::string &gridName )
 {
 	openvdb::GridBase::Ptr grid = vdbObject->findGrid( gridName );
@@ -151,17 +148,44 @@ void insertGrid( VDBObject::Ptr vdbObject, boost::python::object pyObject )
 
 } // namespace
 
+#endif // #ifndef IECOREVDB_USE_PYBIND
+
+namespace
+{
+
+boost::python::list gridNames( VDBObject::Ptr vdbObject )
+{
+	boost::python::list result;
+	std::vector<std::string> names = vdbObject->gridNames();
+	for( const auto &name : names )
+	{
+		result.append( name );
+	}
+	return result;
+}
+
+} // namespace
+
 BOOST_PYTHON_MODULE( _IECoreVDB )
 {
 
+#ifdef IECOREVDB_USE_PYBIND
+	IECorePython::PyBindConverter<openvdb::GridBase::Ptr>::registerConverters();
+#endif
+
 	IECorePython::RunTimeTypedClass<VDBObject>()
 		.def(init<const std::string &>())
 		.def(init<>())
 		.def("gridNames", &::gridNames)
 		.def("metadata", &VDBObject::metadata)
 		.def("removeGrid", &VDBObject::removeGrid)
+#ifdef IECOREVDB_USE_PYBIND
+		.def( "findGrid", (openvdb::GridBase::Ptr (VDBObject::*)( const std::string &name ))&VDBObject::findGrid )
+		.def( "insertGrid", &VDBObject::insertGrid )
+#else
 		.def("findGrid", &::findGrid)
 		.def("insertGrid", &::insertGrid)
+#endif
 		.def("unmodifiedFromFile", &VDBObject::unmodifiedFromFile)
 		.def("fileName", &VDBObject::fileName)
 		;