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

[PCG] Remove the ensure when merging world actor.

Browse Source 
* We will need to address any mismatch if we do more stuff with merged world actors.

#rnx
#rb trivial

[CL 28688112 by adrien logut in ue5-main branch]
This commit is contained in:
adrien logut
2023-10-11 18:34:29 -04:00
parent 025e90afe6
commit 9c1935e19f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Engine/Plugins/Experimental/PCG/Source/PCG/Private/PCGWorldActor.cpp
View File

@@ -189,7 +189,8 @@ void APCGWorldActor::GetGridGuids(PCGHiGenGrid::FSizeToGuidMap& OutSizeToGuidMap
void APCGWorldActor::MergeFrom(APCGWorldActor* OtherWorldActor)
{
check(OtherWorldActor && this != OtherWorldActor);
ensure(PartitionGridSize == OtherWorldActor->PartitionGridSize && bUse2DGrid == OtherWorldActor->bUse2DGrid && GridGuids.OrderIndependentCompareEqual(OtherWorldActor->GridGuids));
// TODO: Is this really important to check? It seems it can fail, cf FORT-664546. We might want to do something special about it.
// ensure(PartitionGridSize == OtherWorldActor->PartitionGridSize && bUse2DGrid == OtherWorldActor->bUse2DGrid && GridGuids.OrderIndependentCompareEqual(OtherWorldActor->GridGuids));
LandscapeCacheObject->TakeOwnership(OtherWorldActor->LandscapeCacheObject);
}