Matching to Houdini build 18.5.41.

suesauer · Nov 26, 2019 · fa27190 · fa27190
1 parent c512979
commit fa27190
Show file tree

Hide file tree

Showing 10 changed files with 532 additions and 59 deletions.
diff --git a/src/houdini/custom/USD/GEO_FilePrimUtils.C b/src/houdini/custom/USD/GEO_FilePrimUtils.C
@@ -302,7 +302,12 @@ initSubsets(GEO_FilePrim &fileprim,
 	prop = subprim.addProperty(UsdGeomTokens->indices,
 	    SdfValueTypeNames->IntArray,
 	    new GEO_FilePropAttribSource<int>(faceset->extractMembers()));
-	prop->setValueIsDefault(true);
+        // Use the topology handling value to decide if geometry subset
+        // membership should be time varying or not. There is a Hydra bug
+        // that requires geom subsets be time varying if the mesh topology
+        // is time varying.
+        prop->setValueIsDefault(
+            options.myTopologyHandling != GEO_USD_TOPOLOGY_ANIMATED);
     }
 }
 
@@ -321,7 +326,8 @@ static void
 initPartition(GEO_FilePrim &fileprim,
 	GEO_FilePrimMap &fileprimmap,
 	const GT_DataArrayHandle &hou_attr,
-	const std::string &attr_name)
+	const std::string &attr_name,
+	const GEO_ImportOptions &options)
 {
     struct Partition {
         UT_StringHolder mySubsetName;
@@ -412,7 +418,12 @@ initPartition(GEO_FilePrim &fileprim,
 	prop = subprim.addProperty(UsdGeomTokens->indices,
 	    SdfValueTypeNames->IntArray,
 	    new GEO_FilePropConstantArraySource<int>(partition.myIndices));
-	prop->setValueIsDefault(true);
+        // Use the topology handling value to decide if geometry subset
+        // membership should be time varying or not. There is a Hydra bug
+        // that requires geom subsets be time varying if the mesh topology
+        // is time varying.
+        prop->setValueIsDefault(
+            options.myTopologyHandling != GEO_USD_TOPOLOGY_ANIMATED);
 	prop = subprim.addProperty(UsdGeomTokens->familyName,
 	    SdfValueTypeNames->Token,
 	    new GEO_FilePropConstantSource<TfToken>(attr_name_token));
@@ -1629,7 +1640,7 @@ initExtraAttribs(GEO_FilePrim &fileprim,
 
 		    if (!hou_attr->hasArrayEntries())
 			initPartition(fileprim, fileprimmap,
-			    hou_attr, attr_name.toStdString());
+			    hou_attr, attr_name.toStdString(), options);
 		}
 		else if (options.multiMatch(attr_name))
 		{

diff --git a/src/houdini/lib/H_USD/HUSD/CMakeSources.cmake b/src/houdini/lib/H_USD/HUSD/CMakeSources.cmake
@@ -71,6 +71,7 @@ set( husd_sources
     HUSD_SetMetadata.C
     HUSD_SetRelationships.C
     HUSD_ShaderTranslator.C
+    HUSD_Skeleton.C
     HUSD_SpecHandle.C
     HUSD_Stitch.C
     HUSD_TimeCode.C
@@ -172,6 +173,7 @@ set( husd_hdk_headers
     HUSD_SetMetadata.h
     HUSD_SetRelationships.h
     HUSD_ShaderTranslator.h
+    HUSD_Skeleton.h
     HUSD_SpecHandle.h
     HUSD_Stitch.h
     HUSD_TimeCode.h