"Replace Previous Bake" will now remove all instances when the Foliag…

…e Type is specified for an instancer.
sideeffects · Mar 23, 2023 · 3efe185 · 3efe185
1 parent 1383dce
commit 3efe185
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/Source/HoudiniEngine/Private/HoudiniFoliageTools.cpp b/Source/HoudiniEngine/Private/HoudiniFoliageTools.cpp
@@ -226,3 +226,21 @@ FHoudiniFoliageTools::RemoveFoliageTypeFromWorld(UWorld* World, UFoliageType* Fo
 }
 
 
+void FHoudiniFoliageTools::RemoveInstancesFromWorld(UWorld* World, UFoliageType* FoliageType)
+{
+	TArray<FFoliageInfo*> FoliageInfos = FHoudiniFoliageTools::GetAllFoliageInfo(World, FoliageType);
+	for (auto& FoliageInfo : FoliageInfos)
+	{
+		if (FoliageInfo != nullptr)
+		{
+			TArray<int> InstancesToRemove;
+			InstancesToRemove.SetNum(FoliageInfo->Instances.Num());
+			for(int Index = 0; Index < FoliageInfo->Instances.Num(); Index++)
+			{
+				InstancesToRemove[Index] = Index;
+			}
+			FoliageInfo->RemoveInstances(InstancesToRemove, true);
+		}
+	}
+}
+
diff --git a/Source/HoudiniEngine/Private/HoudiniFoliageTools.h b/Source/HoudiniEngine/Private/HoudiniFoliageTools.h
@@ -69,5 +69,8 @@ class HOUDINIENGINE_API FHoudiniFoliageTools
 	// Removed Foliage Type from world
 	static void RemoveFoliageTypeFromWorld(UWorld * World, UFoliageType * FoliageType);
 
+	// Remove all instances using this Foliage Type from the world
+	static void RemoveInstancesFromWorld(UWorld* World, UFoliageType* FoliageType);
+
 };
 
diff --git a/Source/HoudiniEngineEditor/Private/HoudiniEngineBakeUtils.cpp b/Source/HoudiniEngineEditor/Private/HoudiniEngineBakeUtils.cpp
@@ -697,6 +697,10 @@ FHoudiniEngineBakeUtils::BakeFoliageTypes(
 			Instance.BaseComponent = nullptr;
 		}
 
+		if (HoudiniAssetComponent->bReplacePreviousBake)
+		{
+			FHoudiniFoliageTools::RemoveInstancesFromWorld(DesiredWorld, TargetFoliageType);
+		}
 		FHoudiniFoliageTools::SpawnFoliageInstance(DesiredWorld, TargetFoliageType, Instances, true);
 
     }