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

Fix "Compile" button in toolbar using legacy hot reload when live coding startup is set to manual.

Browse Source 
#rb none
#jira UE-71359

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5361201 in //UE4/Release-4.22/... via CL 5368484
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381899 by ben marsh in Dev-Anim branch]
This commit is contained in:
ben marsh
2019-03-13 10:02:57 -04:00
parent 1568fd0e82
commit b5e48810ff
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Engine/Source/Developer/Windows/LiveCoding/Private/LiveCodingModule.cpp
View File

@@ -25,6 +25,7 @@ FString GLiveCodingConsoleArguments;
FLiveCodingModule::FLiveCodingModule()
: bEnabledLastTick(false)
, bEnabledForSession(false)
, bStarted(false)
{
}
@@ -135,9 +136,15 @@ void FLiveCodingModule::EnableForSession(bool bEnable)
LppSetVisible(false);
}
}
bEnabledForSession = bEnable;
}
bool FLiveCodingModule::IsEnabledForSession() const
{
return bEnabledForSession;
}
bool FLiveCodingModule::HasStarted() const
{
return bStarted;
}

2
Engine/Source/Developer/Windows/LiveCoding/Private/LiveCodingModule.h
View File

@@ -26,6 +26,7 @@ public:
virtual bool IsEnabledByDefault() const override;
virtual void EnableForSession(bool bInEnabled) override;
virtual bool IsEnabledForSession() const override;
virtual bool HasStarted() const override;
virtual void ShowConsole() override;
virtual void Compile() override;
virtual bool IsCompiling() const override;
@@ -35,6 +36,7 @@ private:
ULiveCodingSettings* Settings;
TSharedPtr<ISettingsSection> SettingsSection;
bool bEnabledLastTick;
bool bEnabledForSession;
bool bStarted;
TSet<FString> EnabledModules;

4
Engine/Source/Developer/Windows/LiveCoding/Public/ILiveCodingModule.h
View File

@@ -12,8 +12,12 @@ class ILiveCodingModule : public IModuleInterface
public:
virtual void EnableByDefault(bool bEnabled) = 0;
virtual bool IsEnabledByDefault() const = 0;
virtual void EnableForSession(bool bEnabled) = 0;
virtual bool IsEnabledForSession() const = 0;
virtual bool HasStarted() const = 0;
virtual void ShowConsole() = 0;
virtual void Compile() = 0;
virtual bool IsCompiling() const = 0;

6
Engine/Source/Editor/LevelEditor/Private/LevelEditorActions.cpp
View File

@@ -1033,7 +1033,7 @@ void FLevelEditorActionCallbacks::RecompileGameCode_Clicked()
{
#if WITH_LIVE_CODING
ILiveCodingModule* LiveCoding = FModuleManager::GetModulePtr<ILiveCodingModule>(LIVE_CODING_MODULE_NAME);
if (LiveCoding != nullptr && LiveCoding->IsEnabledForSession())
if (LiveCoding != nullptr && LiveCoding->IsEnabledByDefault())
{
LiveCoding->Compile();
return;
@@ -1053,7 +1053,7 @@ bool FLevelEditorActionCallbacks::Recompile_CanExecute()
{
#if WITH_LIVE_CODING
ILiveCodingModule* LiveCoding = FModuleManager::GetModulePtr<ILiveCodingModule>(LIVE_CODING_MODULE_NAME);
if (LiveCoding != nullptr && LiveCoding->IsEnabledForSession())
if (LiveCoding != nullptr && LiveCoding->IsEnabledByDefault())
{
return !LiveCoding->IsCompiling();
}
@@ -1099,7 +1099,7 @@ void FLevelEditorActionCallbacks::LiveCoding_StartSession_Clicked()
bool FLevelEditorActionCallbacks::LiveCoding_CanStartSession()
{
ILiveCodingModule* LiveCoding = FModuleManager::GetModulePtr<ILiveCodingModule>(LIVE_CODING_MODULE_NAME);
return LiveCoding != nullptr && LiveCoding->IsEnabledByDefault() && !LiveCoding->IsEnabledForSession();
return LiveCoding != nullptr && LiveCoding->IsEnabledByDefault() && !LiveCoding->HasStarted();
}
void FLevelEditorActionCallbacks::LiveCoding_ShowConsole_Clicked()