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

#UE Delete FArchiveObjectCrc32NonEditorProperties, and use a plain old FArchiveObjectCrc32 with ArIsFilterEditorOnly set to true to test for cook non-determinism. The logic in FArchiveObjectCrc32NonEditorProperties did not properly ignore FNames serialized in editor-only properties

Browse Source 
[FYI] Steve.Robb

[CL 23103381 by bob tellez in ue5-main branch]
This commit is contained in:
bob tellez
2022-11-11 14:56:19 -05:00
parent 45ef8b2f9b
commit 9ca814bcd4
3 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage/SavePackageUtilities.cpp
View File

@@ -159,20 +159,6 @@ void FSavePackageStats::MergeStats(const TMap<FName, FArchiveDiffStats>& ToMerge
#endif
#if WITH_EDITORONLY_DATA
void FArchiveObjectCrc32NonEditorProperties::Serialize(void* Data, int64 Length)
{
int32 NewEditorOnlyProp = EditorOnlyProp + this->IsEditorOnlyPropertyOnTheStack();
TGuardValue<int32> Guard(EditorOnlyProp, NewEditorOnlyProp);
if (NewEditorOnlyProp == 0)
{
Super::Serialize(Data, Length);
}
}
#endif
static FThreadSafeCounter OutstandingAsyncWrites;

33
Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage/SavePackageUtilities.h
View File

@@ -343,39 +343,6 @@ private:
friend FEDLCookChecker;
};
#if WITH_EDITORONLY_DATA
/**
* Archive to calculate a checksum on an object's serialized data stream, but only of its non-editor properties.
*/
class FArchiveObjectCrc32NonEditorProperties : public FArchiveObjectCrc32
{
using Super = FArchiveObjectCrc32;
public:
FArchiveObjectCrc32NonEditorProperties()
: EditorOnlyProp(0)
{
}
virtual FString GetArchiveName() const
{
return TEXT("FArchiveObjectCrc32NonEditorProperties");
}
virtual void Serialize(void* Data, int64 Length);
private:
int32 EditorOnlyProp;
};
#else
class COREUOBJECT_API FArchiveObjectCrc32NonEditorProperties : public FArchiveObjectCrc32
{
};
#endif
// Utility functions used by both UPackage::Save and/or UPackage::Save2
namespace SavePackageUtilities
{

3
Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage2.cpp
View File

@@ -273,7 +273,8 @@ ESavePackageResult RoutePresave(FSaveContext& SaveContext)
{
if (SaveContext.IsCooking() && Object->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
{
FArchiveObjectCrc32NonEditorProperties CrcArchive;
FArchiveObjectCrc32 CrcArchive;
CrcArchive.ArIsFilterEditorOnly = true;
int32 Before = CrcArchive.Crc32(Object);
UE::SavePackageUtilities::CallPreSave(Object, SaveContext.GetObjectSaveContext());
int32 After = CrcArchive.Crc32(Object);