Fixed unreal_bake_folder and unreal_output_name not being applied to Geometry Collection outputs.

Author: andys-sidefx

Source/HoudiniEngine/Private/HoudiniEngineBakeUtils.cpp

@@ -4470,6 +4470,12 @@ FHoudiniEngineBakeUtils::BakeGeometryCollectionOutputToActors(
 			continue;
 		}
 
+		FString* Attribute = Pair.Value.CachedAttributes.Find(HAPI_UNREAL_ATTRIB_BAKE_FOLDER);
+		if(Attribute != nullptr)
+		{
+			PackageParams.BakeFolder = *Attribute;
+		}
+
 		FName WorldOutlinerFolderPath = GetOutlinerFolderPath(
 			Resolver,
 			FName(InFallbackWorldOutlinerFolder.IsEmpty() ? PackageParams.HoudiniAssetActorName : InFallbackWorldOutlinerFolder));
@@ -6372,7 +6378,7 @@ UPhysicsAsset* FHoudiniEngineBakeUtils::DuplicatePhysicsAssetAndCreatePackageIfN
 UGeometryCollection* FHoudiniEngineBakeUtils::DuplicateGeometryCollectionAndCreatePackageIfNeeded(
 	UGeometryCollection* InGeometryCollection, 
 	UGeometryCollection* InPreviousBakeGeometryCollection,
-	const FHoudiniPackageParams& PackageParams, 
+	const FHoudiniPackageParams& InPackageParams, 
 	const TArray<UHoudiniOutput*>& InParentOutputs,
 	const TArray<FHoudiniEngineBakedActor>& InCurrentBakedActors, 
 	const FString& InTemporaryCookFolder,
@@ -6383,6 +6389,9 @@ UGeometryCollection* FHoudiniEngineBakeUtils::DuplicateGeometryCollectionAndCrea
 	if (!IsValid(InGeometryCollection))
 		return nullptr;
 
+	FHoudiniPackageParams PackageParams = InPackageParams;
+	PackageParams.ObjectName = InGeometryCollection->GetName();
+
 	const bool bIsTemporaryStaticMesh = IsObjectTemporary(InGeometryCollection, EHoudiniOutputType::GeometryCollection, InParentOutputs, InTemporaryCookFolder, PackageParams.ComponentGUID);
 	if (!bIsTemporaryStaticMesh)
 	{

Source/HoudiniEngine/Private/HoudiniGeometryCollectionTranslator.cpp

@@ -243,6 +243,9 @@ FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutput
 			OutputObject.OutputActors.Add(GeometryCollectionComponent->GetOwner());
 		}
 
+		FString BakeFolder;
+		if (FHoudiniEngineUtils::GetBakeFolderAttribute(GCData.Identifier.GeoId, GCData.Identifier.PartId, BakeFolder))
+			OutputObject.CachedAttributes.Add(HAPI_UNREAL_ATTRIB_BAKE_FOLDER, BakeFolder);
 
 		// See if we need to force the generation of convex hull data for the GC
 		if (GeometryCollection::SizeSpecific::UsesImplicitCollisionType(GeometryCollection->SizeSpecificData, EImplicitTypeEnum::Chaos_Implicit_Convex)
@@ -391,12 +394,24 @@ FHoudiniGeometryCollectionTranslator::GetGeometryCollectionData(
 
 		// Add _GM suffix to the split str, to distinguish GeometryCollections from StaticMeshes
 		// Additionally add the name to distinguish it from other GC outputs
-		FString SplitStrName = TEXT("");
-		if (!NewPiece.GeometryCollectionName.IsEmpty())
+
+		TArray<FString> OutputNames;
+		if (!HoudiniOutput->GetHoudiniGeoPartObjects().IsEmpty())
+		{
+			auto& HGPO = HoudiniOutput->GetHoudiniGeoPartObjects()[0];
+			FHoudiniEngineUtils::GetOutputNameAttribute(HGPO.GeoId, HGPO.PartId, OutputNames, 0, 1);
+		}
+
+		if (!OutputNames.IsEmpty() && !OutputNames[0].IsEmpty())
+		{
+			GeometryCollectionData->PackParams.ObjectName = OutputNames[0];
+			GeometryCollectionData->PackParams.SplitStr.Empty();
+		}
+		else
 		{
-			SplitStrName += "_" + NewPiece.GeometryCollectionName;
+			GeometryCollectionData->PackParams.ObjectName.Empty();
+			GeometryCollectionData->PackParams.SplitStr = NewPiece.GeometryCollectionName + "_GC";
 		}
-		GeometryCollectionData->PackParams.SplitStr = SplitStrName + "_GC";
 
 		GeometryCollectionData->Identifier.SplitIdentifier = GeometryCollectionData->PackParams.SplitStr;