Do not use the shipped GEO_PrimVDB.h nor GU_PrimVDB.h, but always

use the Houdini version.

Signed-off-by: Jeff Lait <[email protected]>

Author: jmlait

openvdb_houdini/openvdb_houdini/GEO_VDBTranslator.cc

@@ -6,7 +6,7 @@
  *      Side Effects Software Inc.  All rights reserved.
  */
 
-#include "GU_PrimVDB.h"
+#include <GU/GU_PrimVDB.h>
 #include "Utils.h"
 
 #include <UT/UT_EnvControl.h>

openvdb_houdini/openvdb_houdini/GT_GEOPrimCollectVDB.cc

@@ -26,7 +26,7 @@
 #include <GT/GT_PrimCurveMesh.h>
 #include <GU/GU_DetailHandle.h>
 
-#include "GEO_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
 #include <UT/UT_ParallelUtil.h>
 #include <UT/UT_Vector3.h>
 #include <UT/UT_Version.h>

openvdb_houdini/openvdb_houdini/SOP_NodeVDB.cc

@@ -10,8 +10,8 @@
 #include <openvdb/points/PointDataGrid.h>
 #include "PointUtils.h"
 #include "Utils.h"
-#include "GEO_PrimVDB.h"
-#include "GU_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <GU/GU_Detail.h>
 #include <GU/GU_PrimPoly.h>
 #include <OP/OP_NodeInfoParms.h>

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Merge.cc

@@ -11,7 +11,7 @@
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/PointUtils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
 
 #include <openvdb/points/PointDataGrid.h> // points::PointDataGrid
 #include <openvdb/tools/GridTransformer.h> // tools::replaceToMatch()

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Read.cc

@@ -8,8 +8,8 @@
 #include <houdini_utils/ParmFactory.h>
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
-#include <openvdb_houdini/GU_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <UT/UT_Interrupt.h>
 #include <cctype>
 #include <stdexcept>

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Write.cc

@@ -8,8 +8,8 @@
 #include <houdini_utils/ParmFactory.h>
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
-#include <openvdb_houdini/GU_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <PRM/PRM_Parm.h>
 #include <UT/UT_Interrupt.h>
 #include <set>

openvdb_houdini/openvdb_houdini/Utils.cc

@@ -8,7 +8,7 @@
 #include "Utils.h"
 
 #include <houdini_utils/ParmFactory.h>
-#include "GEO_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
 #include <GU/GU_Detail.h>
 #include <UT/UT_String.h>
 #include <UT/UT_Version.h>