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

LiveCoding: Fix determination of whether a module is part of a project plugin. Such modules report "false" for FModuleStatus.bIsGamePlugin.

Browse Source 
#rb none
#jira UE-71399

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5365389 in //UE4/Release-4.22/... via CL 5368509
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5405893 by ben marsh in Dev-Networking branch]
This commit is contained in:
ben marsh
2019-03-14 19:27:02 -04:00
parent fcd9c7b4db
commit 1fc3f1d1a5
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,9 @@ FLiveCodingModule::FLiveCodingModule()
: bEnabledLastTick(false)
, bEnabledForSession(false)
, bStarted(false)
, FullEnginePluginsDir(FPaths::ConvertRelativePathToFull(FPaths::EnginePluginsDir()))
, FullProjectDir(FPaths::ConvertRelativePathToFull(FPaths::ProjectDir()))
, FullProjectPluginsDir(FPaths::ConvertRelativePathToFull(FPaths::ProjectPluginsDir()))
{
}
@@ -249,7 +252,7 @@ void FLiveCodingModule::UpdateModules()
if (ModuleStatus.bIsLoaded)
{
FString FullFilePath = FPaths::ConvertRelativePathToFull(ModuleStatus.FilePath);
ConfigureModule(FName(*ModuleStatus.Name), ModuleStatus.bIsGameModule, FullFilePath);
ConfigureModule(FName(*ModuleStatus.Name), FullFilePath);
}
}
@@ -285,16 +288,16 @@ void FLiveCodingModule::OnModulesChanged(FName ModuleName, EModuleChangeReason R
if (FModuleManager::Get().QueryModule(ModuleName, Status))
{
FString FullFilePath = FPaths::ConvertRelativePathToFull(Status.FilePath);
ConfigureModule(ModuleName, Status.bIsGameModule, FullFilePath);
ConfigureModule(ModuleName, FullFilePath);
}
}
#endif
}
void FLiveCodingModule::ConfigureModule(const FName& Name, bool bIsProjectModule, const FString& FullFilePath)
void FLiveCodingModule::ConfigureModule(const FName& Name, const FString& FullFilePath)
{
#if !IS_MONOLITHIC
if (ShouldEnableModule(Name, bIsProjectModule, FullFilePath))
if (ShouldEnableModule(Name, FullFilePath))
{
EnableModule(FullFilePath);
}
@@ -305,7 +308,7 @@ void FLiveCodingModule::ConfigureModule(const FName& Name, bool bIsProjectModule
#endif
}
bool FLiveCodingModule::ShouldEnableModule(const FName& Name, bool bIsProjectModule, const FString& FullFilePath) const
bool FLiveCodingModule::ShouldEnableModule(const FName& Name, const FString& FullFilePath) const
{
if (Settings->ExcludeSpecificModules.Contains(Name))
{
@@ -316,14 +319,13 @@ bool FLiveCodingModule::ShouldEnableModule(const FName& Name, bool bIsProjectMod
return true;
}
if (bIsProjectModule)
if (FullFilePath.StartsWith(FullProjectDir))
{
if (Settings->bIncludeProjectModules == Settings->bIncludeProjectPluginModules)
{
return Settings->bIncludeProjectModules;
}
FString FullProjectPluginsDir = FPaths::ConvertRelativePathToFull(FPaths::ProjectPluginsDir());
if(FullFilePath.StartsWith(FullProjectPluginsDir))
{
return Settings->bIncludeProjectPluginModules;
@@ -345,7 +347,6 @@ bool FLiveCodingModule::ShouldEnableModule(const FName& Name, bool bIsProjectMod
return Settings->bIncludeEngineModules;
}
FString FullEnginePluginsDir = FPaths::ConvertRelativePathToFull(FPaths::EnginePluginsDir());
if(FullFilePath.StartsWith(FullEnginePluginsDir))
{
return Settings->bIncludeEnginePluginModules;