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

Water: fixed persistent maps which had TWeakObjPtr keys.

Browse Source 
#rb jonathan.bard
#jira UE-190797

[CL 26543172 by roey borsteinas in ue5-main branch]
This commit is contained in:
roey borsteinas
2023-07-24 11:09:54 -04:00
parent 7db5461ddc
commit 32007a2d7c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Plugins/Experimental/Water/Source/Editor/Private/WaterLandscapeBrush.cpp
+8 -8
View File
@@ -54,7 +54,7 @@ void AWaterLandscapeBrush::AddActorInternal(AActor* Actor, const UWorld* ThisWor
if (InCache)
{
Cache.Add(TWeakObjectPtr<AActor>(Actor), InCache);
Cache.Add(TSoftObjectPtr<AActor>(Actor), InCache);
}
if (bTriggerEvent)
@@ -75,7 +75,7 @@ void AWaterLandscapeBrush::RemoveActorInternal(AActor* Actor)
if (Index != INDEX_NONE)
{
ActorsAffectingLandscape.RemoveAt(Index);
Cache.Remove(TWeakObjectPtr<AActor>(Actor));
Cache.Remove(TSoftObjectPtr<AActor>(Actor));
OnActorsAffectingLandscapeChanged();
@@ -134,7 +134,7 @@ void AWaterLandscapeBrush::UpdateActors(bool bInTriggerEvents)
ClearActors();
// Backup Cache
TMap<TWeakObjectPtr<AActor>, TObjectPtr<UObject>> PreviousCache;
TMap<TSoftObjectPtr<AActor>, TObjectPtr<UObject>> PreviousCache;
Swap(Cache, PreviousCache);
if (UWorld* World = GetWorld())
@@ -144,7 +144,7 @@ void AWaterLandscapeBrush::UpdateActors(bool bInTriggerEvents)
AActor* Actor = *It;
if (IWaterBrushActorInterface* WaterBrushActor = Cast<IWaterBrushActorInterface>(Actor))
{
const TObjectPtr<UObject>* FoundCache = PreviousCache.Find(TWeakObjectPtr<AActor>(Actor));
const TObjectPtr<UObject>* FoundCache = PreviousCache.Find(TSoftObjectPtr<AActor>(Actor));
const bool bTriggerEvent = false;
const bool bModify = false;
AddActorInternal(Actor, World, FoundCache != nullptr ? *FoundCache : nullptr, bTriggerEvent, bModify);
@@ -398,7 +398,7 @@ void AWaterLandscapeBrush::AddReferencedObjects(UObject* InThis, FReferenceColle
Super::AddReferencedObjects(This, Collector);
// TODO [jonathan.bard] : remove : probably not necessary since it's now a uproperty :
for (TPair<TWeakObjectPtr<AActor>, TObjectPtr<UObject>>& Pair : This->Cache)
for (TPair<TSoftObjectPtr<AActor>, TObjectPtr<UObject>>& Pair : This->Cache)
{
Collector.AddReferencedObject(Pair.Value);
}
@@ -434,14 +434,14 @@ void AWaterLandscapeBrush::SetActorCache(AActor* InActor, UObject* InCache)
return;
}
TObjectPtr<UObject>& Value = Cache.FindOrAdd(TWeakObjectPtr<AActor>(InActor));
TObjectPtr<UObject>& Value = Cache.FindOrAdd(TSoftObjectPtr<AActor>(InActor));
Value = InCache;
}
UObject* AWaterLandscapeBrush::GetActorCache(AActor* InActor, TSubclassOf<UObject> CacheClass) const
{
TObjectPtr<UObject> const* ValuePtr = Cache.Find(TWeakObjectPtr<AActor>(InActor));
TObjectPtr<UObject> const* ValuePtr = Cache.Find(TSoftObjectPtr<AActor>(InActor));
if (ValuePtr && (*ValuePtr) && (*ValuePtr)->IsA(*CacheClass))
{
return *ValuePtr;
@@ -451,7 +451,7 @@ UObject* AWaterLandscapeBrush::GetActorCache(AActor* InActor, TSubclassOf<UObjec
void AWaterLandscapeBrush::ClearActorCache(AActor* InActor)
{
Cache.Remove(TWeakObjectPtr<AActor>(InActor));
Cache.Remove(TSoftObjectPtr<AActor>(InActor));
}
void AWaterLandscapeBrush::BlueprintGetRenderTargets_Implementation(UTextureRenderTarget2D* InHeightRenderTarget, UTextureRenderTarget2D*& OutVelocityRenderTarget)
Engine/Plugins/Experimental/Water/Source/Editor/Private/WaterLandscapeBrush.h
+1 -1
View File
@@ -148,5 +148,5 @@ private:
#endif // WITH_EDITOR
UPROPERTY(Transient, DuplicateTransient, VisibleAnywhere, AdvancedDisplay, meta = (Category = "Debug"))
TMap<TWeakObjectPtr<AActor>, TObjectPtr<UObject>> Cache;
TMap<TSoftObjectPtr<AActor>, TObjectPtr<UObject>> Cache;
};