izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Undoing the creation of an in-editor only (not saved yet) Geometry Collection will now correctly update the Content Browser.

Browse Source 
#jira: UE-155916
#rb Jamie.Dale Jimmy.Andrews Julien.StJean
#preflight 62b34805d76167320e2df6e8

#ROBOMERGE-AUTHOR: ronald.koppers
#ROBOMERGE-SOURCE: CL 20776943 in //UE5/Main/...
#ROBOMERGE-BOT: UE5 (Main -> Release-Engine-Staging) (v970-20704180)

[CL 20776975 by ronald koppers in ue5-release-engine-staging branch]
This commit is contained in:
ronald koppers
2022-06-22 13:08:12 -04:00
parent 1221bdd959
commit 2509445981
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Engine/Plugins/Experimental/ChaosEditor/Source/FractureEditor/Private/FractureToolGenerators.cpp
View File

@@ -12,6 +12,8 @@
#include "Engine/SkeletalMesh.h"
#include "Engine/StaticMesh.h"
#include "Engine/StaticMeshActor.h"
#include "Misc/Change.h"
#include "ChangeTransactor.h"
#include "FractureModeSettings.h"
@@ -25,9 +27,28 @@
#include "GeometryCollection/GeometryCollectionProximityUtility.h"
#include "FractureToolContext.h"
#define LOCTEXT_NAMESPACE "FractureToolGenerators"
// Creates an undo/redo action that (un)registers and object with the Asset Registry.
// Upon undo this causes the object to be unregistered and as a result be removed from
// Content Browsers.
class FAssetRegistrationChange final : public FCommandChange
{
public:
void Apply(UObject* Object) override
{
FAssetRegistryModule::AssetCreated(Object);
}
void Revert(UObject* Object) override
{
FAssetRegistryModule::AssetDeleted(Object);
}
FString ToString() const override
{
return TEXT("Asset registry from " LOCTEXT_NAMESPACE);
}
};
FText UFractureToolGenerateAsset::GetDisplayText() const
{
@@ -274,7 +295,6 @@ AGeometryCollectionActor* UFractureToolGenerateAsset::ConvertActorsToGeometryCol
class AGeometryCollectionActor* UFractureToolGenerateAsset::CreateNewGeometryActor(const FString& InAssetPath, const FTransform& Transform, bool AddMaterials /*= false*/)
{
FString UniquePackageName = InAssetPath;
FString UniqueAssetName = FPackageName::GetLongPackageAssetName(InAssetPath);
@@ -285,6 +305,12 @@ class AGeometryCollectionActor* UFractureToolGenerateAsset::CreateNewGeometryAct
UGeometryCollection* InGeometryCollection = static_cast<UGeometryCollection*>(NewObject<UGeometryCollection>(Package, UGeometryCollection::StaticClass(), FName(*UniqueAssetName), RF_Transactional | RF_Public | RF_Standalone));
if(!InGeometryCollection->SizeSpecificData.Num()) InGeometryCollection->SizeSpecificData.Add(FGeometryCollectionSizeSpecificData());
// Record the creation of the geometry collection so it's removed from the Asset Registry and the Content Browser when undo is called.
UE::FChangeTransactor Transactor(InGeometryCollection);
Transactor.OpenTransaction(LOCTEXT("GeometryCollectionAssetRegistration", "Geometry Collection Asset Registration"));
Transactor.AddTransactionChange<FAssetRegistrationChange>();
Transactor.CloseTransaction();
// Create the new Geometry Collection actor
AGeometryCollectionActor* NewActor = Cast<AGeometryCollectionActor>(AddActor(GetSelectedLevel(), AGeometryCollectionActor::StaticClass()));
check(NewActor->GetGeometryCollectionComponent());