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

#jira UE-113757

Browse Source 
Unstable crash on moving assets from one folder to another

Referencing packages & possibly their non RF_Standalone content were GC'd at the first GC pass, before they had the chance of being saved.
Made sure referencing packages are saved before a GC pass is done.

#ROBOMERGE-SOURCE: CL 16060766 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)

[CL 16064236 by sebastien lussier in ue5-main branch]
This commit is contained in:
sebastien lussier
2021-04-20 14:35:25 -04:00
parent a578ea1934
commit 96cdb23b80
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Engine/Source/Developer/AssetTools/Private/AssetRenameManager.cpp
View File

@@ -472,10 +472,8 @@ bool FAssetRenameManager::FixReferencesAndRename(const TArray<FAssetRenameData>&
else
{
// Perform the rename, leaving redirectors only for assets which need them
PerformAssetRename(AssetsToRename);
// Save all packages that were referencing any of the assets that were moved without redirectors
SaveReferencingPackages(ReferencingPackagesToSave);
// Also save all packages that were referencing any of the assets that were moved without redirectors
PerformAssetRename(AssetsToRename, ReferencingPackagesToSave);
// Issue post rename event
AssetPostRenameEvent.Broadcast(AssetsAndNames);
@@ -1373,6 +1371,11 @@ bool FAssetRenameManager::CheckPackageForSoftObjectReferences(UPackage* Package,
}
void FAssetRenameManager::PerformAssetRename(TArray<FAssetRenameDataWithReferencers>& AssetsToRename) const
{
PerformAssetRename(AssetsToRename, TArray<UPackage*>());
}
void FAssetRenameManager::PerformAssetRename(TArray<FAssetRenameDataWithReferencers>& AssetsToRename, const TArray<UPackage*>& ReferencingPackagesToSave) const
{
const FText AssetRenameSlowTask = LOCTEXT("AssetRenameSlowTask", "Renaming Assets");
GWarn->BeginSlowTask(AssetRenameSlowTask, true);
@@ -1388,7 +1391,7 @@ void FAssetRenameManager::PerformAssetRename(TArray<FAssetRenameDataWithReferenc
FEditorFileUtils::GetDirtyWorldPackages(DirtyPackagesToCheckForSoftReferences);
FEditorFileUtils::GetDirtyContentPackages(DirtyPackagesToCheckForSoftReferences);
TArray<UPackage*> PackagesToSave;
TArray<UPackage*> PackagesToSave = ReferencingPackagesToSave;
TArray<UPackage*> PotentialPackagesToDelete;
for (int32 AssetIdx = 0; AssetIdx < AssetsToRename.Num(); ++AssetIdx)
{

3
Engine/Source/Developer/AssetTools/Private/AssetRenameManager.h
View File

@@ -110,6 +110,9 @@ private:
/** Performs the asset rename after the user has selected to proceed */
void PerformAssetRename(TArray<FAssetRenameDataWithReferencers>& AssetsToRename) const;
/** Performs the asset rename after the user has selected to proceed, also saving the provided referencing packages at the same time */
void PerformAssetRename(TArray<FAssetRenameDataWithReferencers>& AssetsToRename, const TArray<UPackage*>& ReferencingPackagesToSave) const;
/** Saves all the referencing packages and updates SCC state */
void SaveReferencingPackages(const TArray<UPackage*>& ReferencingPackagesToSave) const;