Matching to Houdini build 18.5.51.

suesauer · Dec 6, 2019 · 5b39116 · 5b39116
1 parent 8e7f1cb
commit 5b39116
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/houdini/custom/USD/GEO_FileData.C b/src/houdini/custom/USD/GEO_FileData.C
@@ -165,8 +165,9 @@ GEO_FileData::Open(const std::string& filePath)
     }
     else
     {
-	gdh.allocateAndSet(new GU_Detail());
+        orig_path_with_args = SdfLayer::CreateIdentifier(filePath, myCookArgs);
 
+	gdh.allocateAndSet(new GU_Detail());
 	GU_DetailHandleAutoWriteLock	 gdp_write_lock(gdh);
 	GU_Detail			*gdp = gdp_write_lock.getGdp();
 	auto				 status = gdp->load(filePath.c_str());

diff --git a/src/houdini/custom/USD/usd_plugins/usdHGeo/resources/plugInfo.json b/src/houdini/custom/USD/usd_plugins/usdHGeo/resources/plugInfo.json
@@ -28,7 +28,8 @@
                             "bgeo",
 			    "sop",
 			    "gz",
-			    "sc"
+			    "sc",
+                            "vdb"
                         ],
                         "formatId": "geo",
                         "primary": true,

diff --git a/src/houdini/custom/USDOP/HUSD_FieldWrapper.C b/src/houdini/custom/USDOP/HUSD_FieldWrapper.C
@@ -19,6 +19,7 @@
 #include <GT/GT_PrimVDB.h>
 #include <GT/GT_PrimVolume.h>
 #include <GT/GT_Refine.h>
+#include <gusd/xformWrapper.h>
 #include <HUSD/HUSD_HydraField.h>
 #include <HUSD/XUSD_Tokens.h>
 
@@ -27,6 +28,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 TF_DEFINE_PRIVATE_TOKENS(_tokens,
     ((vdbFieldPrimType,  "OpenVDBAsset"))
     ((houdiniFieldPrimType, "HoudiniFieldAsset"))
+    ((volumePrimType, "Volume"))
 );
 
 void
@@ -40,6 +42,10 @@ HUSD_FieldWrapper::registerForRead()
             _tokens->vdbFieldPrimType, &HUSD_FieldWrapper::defineForRead);
         GusdPrimWrapper::registerPrimDefinitionFuncForRead(
             _tokens->houdiniFieldPrimType, &HUSD_FieldWrapper::defineForRead);
+
+        // Also register Volume primitives so that they unpack to fields.
+        GusdPrimWrapper::registerPrimDefinitionFuncForRead(
+            _tokens->volumePrimType, &GusdXformWrapper::defineForRead);
     });
 }
 

diff --git a/src/houdini/lib/H_USD/HUSD/HUSD_Skeleton.C b/src/houdini/lib/H_USD/HUSD/HUSD_Skeleton.C
@@ -145,7 +145,6 @@ HUSDimportSkinnedGeometry(GU_Detail &gdp, const HUSD_AutoReadLock &readlock,
     for (exint i = 0, n = strings.size(); i < n; ++i)
     {
         SdfPath prim_path = HUSDgetSdfPath(strings[i]);
-        prim_path.MakeRelativePath(root_path);
 
         shapeattrib_h->replaceString(
             GA_StringIndexType(handles[i]),

diff --git a/src/houdini/lib/H_USD/gusd/xformWrapper.h b/src/houdini/lib/H_USD/gusd/xformWrapper.h
@@ -99,7 +99,7 @@ class GusdXformWrapper : public GusdGroupBaseWrapper
                      const SdfPath& path,
                      const GusdContext& ctxt);
 
-    static GT_PrimitiveHandle
+    static GUSD_API GT_PrimitiveHandle
     defineForRead( const UsdGeomImageable&  sourcePrim, 
                    UsdTimeCode              time,
                    GusdPurposeSet           purposes );
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,8 @@ @@
                                 "bgeo",
     			    "sop",
     			    "gz",
-    			    "sc"
+    			    "sc",
+                                "vdb"
                             ],
                             "formatId": "geo",
                             "primary": true,
@@ Expand Down @@