- Fixed various issues with texture asset support in geometry input.

  Updating the export options or resending the same texture now behaves properly.
- Added the mandatory category specifier for Cookable properties that could cause
  issues when building the plugin as an engine plugin.
- "Export Main Geo" is now properly taken into account for node name suffixes in the
  input system. This avoids bugs when two inputs points to the same asset with
  different value for that option.

Author: dpernuit

Source/HoudiniEngine/Private/HoudiniEngineManager.cpp

@@ -119,7 +119,7 @@ FHoudiniEngineManager::StopHoudiniTicking()
 	{
 		if (IsInGameThread())
 		{
-			FTSTicker::GetCoreTicker().RemoveTicker(TickerHandle);			
+			FTSTicker::GetCoreTicker().RemoveTicker(TickerHandle);
 			TickerHandle.Reset();
 
 			// Reset time for delayed notification.
@@ -628,7 +628,7 @@ FHoudiniEngineManager::ProcessCookable(UHoudiniCookable* HC)
 			}
 			else
 			{
-				// TODO COOKABLE: UPDATE ME! this only suppoRts Cookable with assets...
+				// TODO COOKABLE: UPDATE ME! this only supports Cookable with assets...
 				if (HC->IsHoudiniAssetSupported())
 				{
 					FGuid TaskGuid;

Source/HoudiniEngine/Private/HoudiniInputTranslator.cpp

@@ -4902,22 +4902,26 @@ FHoudiniInputTranslator::HapiCreateInputNodeForTexture2D(
 	FString TextureName = InObjNodeName + TEXT("_") + InputTexture->GetName();
 	FHoudiniEngineUtils::SanitizeHAPIVariableName(TextureName);
 
+	// Only the ExportMainGeo and ImportAsRef options matter for Textures
+	FUnrealObjectInputOptions Options;
+	Options.bExportMainGeometry = InInputSettings.bExportMainGeometry;
+	Options.bImportAsReference = InInputSettings.bImportAsReference;
+	
 	FUnrealObjectInputIdentifier Identifier;
+	Identifier = FUnrealObjectInputIdentifier(InputTexture, Options, true);
+	
+	FUnrealObjectInputHandle InputNodeHandle;
 	FUnrealObjectInputHandle ParentHandle;
-	{
-		const FUnrealObjectInputOptions Options;
-		Identifier = FUnrealObjectInputIdentifier(InputTexture, Options, true);
-
-		FUnrealObjectInputHandle Handle;
-		if (FUnrealObjectInputUtils::NodeExistsAndIsNotDirty(Identifier, Handle))
+	{		
+		if (FUnrealObjectInputUtils::NodeExistsAndIsNotDirty(Identifier, InputNodeHandle))
 		{
 			HAPI_NodeId NodeId = -1;
-			if (FUnrealObjectInputUtils::GetHAPINodeId(Handle, NodeId))
+			if (FUnrealObjectInputUtils::GetHAPINodeId(InputNodeHandle, NodeId))
 			{
 				if (!bInputNodesCanBeDeleted)
-					FUnrealObjectInputUtils::UpdateInputNodeCanBeDeleted(Handle, bInputNodesCanBeDeleted);
+					FUnrealObjectInputUtils::UpdateInputNodeCanBeDeleted(InputNodeHandle, bInputNodesCanBeDeleted);
 
-				InObject->InputNodeHandle = Handle;
+				InObject->InputNodeHandle = InputNodeHandle;
 				CreatedNodeId = NodeId;
 				return true;
 			}
@@ -4930,9 +4934,9 @@ FHoudiniInputTranslator::HapiCreateInputNodeForTexture2D(
 		// Set InputNodeId to the current NodeId associated with Handle, since that is what we are replacing.
 		// (Option changes could mean that InputNodeId is associated with a completely different entry, albeit for
 		// the same asset, in the manager)
-		if (Handle.IsValid())
+		if (InputNodeHandle.IsValid())
 		{
-			if (!FUnrealObjectInputUtils::GetHAPINodeId(Handle, CreatedNodeId))
+			if (!FUnrealObjectInputUtils::GetHAPINodeId(InputNodeHandle, CreatedNodeId))
 				CreatedNodeId = -1;
 		}
 		else
@@ -4942,7 +4946,6 @@ FHoudiniInputTranslator::HapiCreateInputNodeForTexture2D(
 	}
 
 	HAPI_NodeId GeoOutId = -1;
-	FUnrealObjectInputHandle InputNodeHandle;
 	bool bSuccess = true;
 	if (InInputSettings.bImportAsReference)
 	{
@@ -4966,36 +4969,51 @@ FHoudiniInputTranslator::HapiCreateInputNodeForTexture2D(
 		ParentNodeId = FHoudiniEngineUtils::HapiGetParentNodeId(CreatedNodeId);
 	}
 	else
-	{		
-		if (CreatedNodeId < 0)
+	{	
+		// Clean previously created nodes if needed
+		HAPI_NodeId PreviousInputNodeId = CreatedNodeId;
+		if (PreviousInputNodeId >= 0)
 		{
-			HAPI_Result Result = FHoudiniEngineUtils::CreateNode(ParentNodeId, TEXT("geo"), TextureName, true, &CreatedNodeId);
-			if (Result != HAPI_RESULT_SUCCESS)
-			{
-				HOUDINI_LOG_WARNING(TEXT("[FHoudiniEngineUtils::CreateInputNode]: CreateNode failed: %s"), *FHoudiniEngineUtils::GetErrorDescription());
-				return false;
-			}
+			HAPI_NodeId PreviousInputObjectNodeId = FHoudiniEngineUtils::HapiGetParentNodeId(PreviousInputNodeId);
+			if (FHoudiniApi::DeleteNode(FHoudiniEngine::Get().GetSession(), PreviousInputNodeId) != HAPI_RESULT_SUCCESS)
+				HOUDINI_LOG_WARNING(TEXT("Failed to cleanup the previous input node for %s."), *TextureName);
 
-			if (InInputSettings.bExportMainGeometry)
-			{
-				if (FUnrealTextureTranslator::CreateGeometryForTexture(CreatedNodeId, GeoOutId))
-				{
-					ParentNodeId = CreatedNodeId;
-				}
-			}
-			else
+			if (FHoudiniApi::DeleteNode(FHoudiniEngine::Get().GetSession(), PreviousInputObjectNodeId) != HAPI_RESULT_SUCCESS)
+				HOUDINI_LOG_WARNING(TEXT("Failed to cleanup the previous input object node for %s."), *TextureName);
+
+			// We've deleted the parent - make sure it exists and updates its ID
+			if (FUnrealObjectInputUtils::EnsureParentsExist(Identifier, ParentHandle, bInputNodesCanBeDeleted) && ParentHandle.IsValid())
+				FUnrealObjectInputUtils::GetHAPINodeId(ParentHandle, ParentNodeId);
+		}
+
+
+		// Create the geo node that will hold the COPnet and the quad geometry (if needed)
+		HAPI_Result Result = FHoudiniEngineUtils::CreateNode(ParentNodeId, TEXT("geo"), TextureName, true, &CreatedNodeId);
+		if (Result != HAPI_RESULT_SUCCESS)
+		{
+			HOUDINI_LOG_WARNING(TEXT("[FHoudiniEngineUtils::CreateInputNode]: CreateNode failed: %s"), *FHoudiniEngineUtils::GetErrorDescription());
+			return false;
+		}
+
+		if (InInputSettings.bExportMainGeometry)
+		{
+			// Create a quad with uvs and a coppreview material to "hold" the texture
+			if (FUnrealTextureTranslator::CreateGeometryForTexture(CreatedNodeId, GeoOutId))
 			{
 				ParentNodeId = CreatedNodeId;
 			}
 		}
 		else
 		{
-			ParentNodeId = FHoudiniEngineUtils::HapiGetParentNodeId(CreatedNodeId);
+			ParentNodeId = CreatedNodeId;
 		}
-
+	}
+		// Send the texture to COPs
 		bSuccess = FUnrealTextureTranslator::HapiCreateCOPTexture(
 			InputTexture, CreatedNodeId);
 
+		// Now that the textures has been created, cook the grid
+		// (this helps with visual issues when using session sync)
 		if (GeoOutId >= 0)
 		{
 			FHoudiniEngineUtils::HapiCookNode(GeoOutId);

Source/HoudiniEngine/Private/HoudiniPCGCookable.h

@@ -119,7 +119,7 @@ class HOUDINIENGINE_API UHoudiniPCGCookable  : public UObject
 	UPROPERTY(EditAnywhere, Category = Settings)
 	bool bAutomaticallyDeleteAssets = true;
 
-	UPROPERTY(BlueprintReadWrite, EditAnywhere)
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UHoudiniCookable> Cookable;
 
 	UPROPERTY()

Source/HoudiniEngineRuntime/Private/HoudiniCookable.h

@@ -335,7 +335,7 @@ class HOUDINIENGINERUNTIME_API UCookableComponentData : public UObject
 
 	UCookableComponentData();
 
-	UPROPERTY(VisibleAnywhere)
+	UPROPERTY(VisibleAnywhere, Category = "Houdini Cookable")
 	TWeakObjectPtr<USceneComponent> Component; 
 
 	// Used to compare transform changes and whether we need to
@@ -912,7 +912,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasHoudiniAsset;
 
 	// Structure containing the HDA data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableHoudiniAssetData> HoudiniAssetData;
 
 	// PARAMETERS
@@ -921,7 +921,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasParameters;
 
 	// Structure containing the parameter data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableParameterData> ParameterData;
 
 	// INPUTS
@@ -930,7 +930,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasInputs;
 
 	// Structure containing the input data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableInputData> InputData;
 
 	// OUTPUTS
@@ -939,7 +939,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasOutputs;
 
 	// Structure containing the output data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableOutputData> OutputData;
 
 	// COMPONENTS / TRANSFORM
@@ -948,7 +948,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasComponent; // bIsInWorld?
 
 	// Structure containing the component's data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableComponentData> ComponentData;
 
 	// PDG
@@ -957,23 +957,23 @@ class HOUDINIENGINERUNTIME_API UHoudiniCookable : public UObject, public IHoudin
 	bool bHasPDG;
 
 	// Structure containing the PDG data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookablePDGData> PDGData;
 
 	// Baking
 	// Indicates if this cookable has access to baking
 	UPROPERTY()
 	bool bHasBaking;
 	// Structure containing the Baking data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableBakingData> BakingData;
 
 	// Proxy
 	// Indicates if this cookable canm use proxy meshes
 	UPROPERTY()
 	bool bHasProxy;
 	// Structure containing the Proxy data
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, Category = "Houdini Cookable")
 	TObjectPtr<UCookableProxyData> ProxyData;
 
 	//

Source/HoudiniEngineRuntime/Private/UnrealObjectInputRuntimeTypes.cpp

@@ -373,6 +373,8 @@ FUnrealObjectInputOptions::GenerateNodeNameSuffix() const
 		NameParts.Add(TEXT("landscape_edit_layers"));
 	if (!bExportLevelInstanceContent)
 		NameParts.Add(TEXT("level_instance_ref"));
+	if(!bExportMainGeometry)
+		NameParts.Add(TEXT("no_main_geo"));
 	if (BoolOptions.Num() > 0)
 	{
 		for (const auto& BoolOption : BoolOptions)