j.foucher/PS_ProserveEditor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset bIsEditorModeActive on editor-PC EndPlay and SceneLoader entry

Browse Source 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
j.foucher
2026-05-05 13:28:39 +02:00
parent 67ac3ffab7
commit d9ed016297
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Unreal/Plugins/PS_Editor/Source/PS_Editor/GameMode/PS_Editor_PlayerController.cpp
View File

@@ -210,6 +210,20 @@ void APS_Editor_PlayerController::BeginPlay()
}); });
} }
void APS_Editor_PlayerController::EndPlay(const EEndPlayReason::Type EndPlayReason)
{
// Reset the runtime-editor flag whenever this controller's world tears down — covers
// OpenLevel from any caller (Play button, scenario loader BP, gameplay code that calls
// OpenLevel directly), end of PIE, and seamless world transitions. Without this, the
// static would stay 'true' from the previous editor session and IsInEditorMode() would
// lie in the next world (which has no PS_Editor PlayerController). The 3 existing eager
// resets (CloseEditor + Play buttons) remain as defense-in-depth so any check between
// the click and the actual world tear-down also returns false.
UPS_Editor_SceneLoader::bIsEditorModeActive = false;
Super::EndPlay(EndPlayReason);
}
void APS_Editor_PlayerController::Tick(float DeltaTime) void APS_Editor_PlayerController::Tick(float DeltaTime)
{ {
Super::Tick(DeltaTime); Super::Tick(DeltaTime);

1
Unreal/Plugins/PS_Editor/Source/PS_Editor/GameMode/PS_Editor_PlayerController.h
View File

@@ -143,6 +143,7 @@ public:
protected: protected:
virtual void BeginPlay() override; virtual void BeginPlay() override;
virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
virtual void Tick(float DeltaTime) override; virtual void Tick(float DeltaTime) override;
virtual void OnPossess(APawn* InPawn) override; virtual void OnPossess(APawn* InPawn) override;

7
Unreal/Plugins/PS_Editor/Source/PS_Editor/Serialization/PS_Editor_SceneLoader.cpp
View File

@@ -131,6 +131,13 @@ bool UPS_Editor_SceneLoader::LoadSceneFromData(UWorld* World, const FPS_Editor_S
return false; return false;
} }
// Defensive: reaching the gameplay-side SceneLoader means we are NOT in the runtime
// editor (the editor uses UPS_Editor_SceneSerializer instead). Force the static flag
// false now so subsequent IsInEditorMode() checks reflect reality even if a previous
// PIE session left the static at 'true' — PIE keeps C++ statics across stop/start, and
// a forced PIE-stop or BP-driven OpenLevel can skip the EndPlay reset on the editor PC.
bIsEditorModeActive = false;
// Apply the scenario's dynamic-navigation flag BEFORE spawning actors. If the scenario // Apply the scenario's dynamic-navigation flag BEFORE spawning actors. If the scenario
// needs runtime nav generation, switching the level's RecastNavMesh to Dynamic now // needs runtime nav generation, switching the level's RecastNavMesh to Dynamic now
// means the actors we're about to spawn will dirty + rebuild tiles around them. Cooked // means the actors we're about to spawn will dirty + rebuild tiles around them. Cooked