You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
7d8003023f
Our approach to deleting actors was apparently not sufficient to notify various editor systems of the deletion. This CL replaces AActor::Destroy with calls to UUnrealEdEngine::DeleteActors and UWorld::DeleteActor (depending on the context) #rb lonnie.li #jira UE-204240 [CL 31304400 by nickolas drake in ue5-main branch]
101 lines
2.6 KiB
C++
101 lines
2.6 KiB
C++
// Copyright Epic Games, Inc. All Rights Reserved.
|
|
|
|
#include "PropertySets/OnAcceptProperties.h"
|
|
|
|
#include "Engine/World.h"
|
|
#include "GameFramework/Actor.h"
|
|
#include "UObject/UObjectGlobals.h"
|
|
#include "InteractiveToolManager.h"
|
|
|
|
#if WITH_EDITOR
|
|
#include "Editor/UnrealEdEngine.h"
|
|
#include "Selection.h"
|
|
#include "UnrealEdGlobals.h"
|
|
#endif
|
|
|
|
#include UE_INLINE_GENERATED_CPP_BY_NAME(OnAcceptProperties)
|
|
|
|
#define LOCTEXT_NAMESPACE "UOnAcceptHandleSourcesProperties"
|
|
|
|
|
|
void UOnAcceptHandleSourcesPropertiesBase::ApplyMethod(const TArray<AActor*>& Actors, UInteractiveToolManager* ToolManager, const AActor* MustKeepActor)
|
|
{
|
|
const EHandleSourcesMethod HandleInputs = GetHandleInputs();
|
|
|
|
// Hide or destroy the sources
|
|
bool bKeepSources = HandleInputs == EHandleSourcesMethod::KeepSources;
|
|
if (Actors.Num() == 1 && (HandleInputs == EHandleSourcesMethod::KeepFirstSource || HandleInputs == EHandleSourcesMethod::KeepLastSource))
|
|
{
|
|
// if there's only one actor, keeping any source == keeping all sources
|
|
bKeepSources = true;
|
|
}
|
|
if (!bKeepSources)
|
|
{
|
|
bool bDelete = HandleInputs == EHandleSourcesMethod::DeleteSources
|
|
|| HandleInputs == EHandleSourcesMethod::KeepFirstSource
|
|
|| HandleInputs == EHandleSourcesMethod::KeepLastSource;
|
|
if (bDelete)
|
|
{
|
|
ToolManager->BeginUndoTransaction(LOCTEXT("RemoveSources", "Remove Inputs"));
|
|
}
|
|
else
|
|
{
|
|
#if WITH_EDITOR
|
|
ToolManager->BeginUndoTransaction(LOCTEXT("HideSources", "Hide Inputs"));
|
|
#endif
|
|
}
|
|
|
|
const int32 ActorIdxBegin = HandleInputs == EHandleSourcesMethod::KeepFirstSource ? 1 : 0;
|
|
const int32 ActorIdxEnd = HandleInputs == EHandleSourcesMethod::KeepLastSource ? Actors.Num() - 1 : Actors.Num();
|
|
|
|
for (int32 ActorIdx = ActorIdxBegin; ActorIdx < ActorIdxEnd; ActorIdx++)
|
|
{
|
|
AActor* Actor = Actors[ActorIdx];
|
|
if (Actor == MustKeepActor)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (bDelete)
|
|
{
|
|
if (UWorld* ActorWorld = Actor->GetWorld())
|
|
{
|
|
#if WITH_EDITOR
|
|
if (GIsEditor && GUnrealEd)
|
|
{
|
|
GUnrealEd->DeleteActors(TArray{Actor}, ActorWorld, GUnrealEd->GetSelectedActors()->GetElementSelectionSet());
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
ActorWorld->DestroyActor(Actor);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
#if WITH_EDITOR
|
|
// Save the actor to the transaction buffer to support undo/redo, but do
|
|
// not call Modify, as we do not want to dirty the actor's package and
|
|
// we're only editing temporary, transient values
|
|
SaveToTransactionBuffer(Actor, false);
|
|
Actor->SetIsTemporarilyHiddenInEditor(true);
|
|
#endif
|
|
}
|
|
}
|
|
if (bDelete)
|
|
{
|
|
ToolManager->EndUndoTransaction();
|
|
}
|
|
else
|
|
{
|
|
#if WITH_EDITOR
|
|
ToolManager->EndUndoTransaction();
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
#undef LOCTEXT_NAMESPACE
|
|
|