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

Fixed platform extensions functionality for plugins

Browse Source 
- Add AdditionalRestrictedFolders to FDataDrivenPlatformInfoRegistry
- Fixed FPluginManager::ReadAllPlugins() to scan AdditionalRestrictedFolders to find related platform directory for plugin
- Fixed FPluginManager::CreatePluginObject() complaining about existing plugin found twice (ignore if same source path)
- Fixed Plugins::TryMergeWithParent() handling for blacklist merge with child - if parent had blacklist but child didn't, child was incorrectly added to blacklist

#jira UE-82655
#rb josh.adams
#rnx

#ROBOMERGE-SOURCE: CL 9894962 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)

[CL 9894965 by jeff newquist in Main branch]
This commit is contained in:
jeff newquist
2019-10-30 15:58:59 -04:00
parent d29601da1d
commit b37fd44761
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Programs/UnrealBuildTool/System/Plugins.cs
+2 -6
View File
@@ -396,16 +396,12 @@ namespace UnrealBuildTool
}
if (ParentModule.BlacklistPlatforms != null && ParentModule.BlacklistPlatforms.Length > 0)
{
List<UnrealTargetPlatform> Blacklist = ParentModule.BlacklistPlatforms.ToList();
if (ChildModule.BlacklistPlatforms != null && ChildModule.BlacklistPlatforms.Length > 0)
{
List<UnrealTargetPlatform> Blacklist = ParentModule.BlacklistPlatforms.ToList();
Blacklist.AddRange(ChildModule.BlacklistPlatforms);
ParentModule.BlacklistPlatforms = Blacklist.ToArray();
}
else
{
Blacklist.Add(Platform);
}
ParentModule.BlacklistPlatforms = Blacklist.ToArray();
}
}
}