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

Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

Browse Source 
#jira 0
#rb None

[CL 4161603 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2018-06-26 08:42:47 -04:00
parent 2ce8b70ef9 6bf4271de3
commit 2792c7c559
8166 changed files with 436245 additions and 217422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenModule.cpp
View File

@@ -799,7 +799,7 @@ UObject* FBlueprintNativeCodeGenModule::FindReplacedNameAndOuter(UObject* Object
EReplacementResult FBlueprintNativeCodeGenModule::IsTargetedForReplacement(const UPackage* Package, const FCompilerNativizationOptions& NativizationOptions) const
{
// non-native packages with enums and structs should be converted, unless they are blacklisted:
// non-native packages with enums and structs should be converted, unless they are exced:
UStruct* Struct = nullptr;
UEnum* Enum = nullptr;
GetFieldFormPackage(Package, Struct, Enum, RF_NoFlags);
@@ -1219,6 +1219,7 @@ void FBlueprintNativeCodeGenModule::FillPlatformNativizationDetails(const ITarge
Details.CompilerNativizationOptions.PlatformName = Details.PlatformName;
Details.CompilerNativizationOptions.ClientOnlyPlatform = Platform->IsClientOnly();
Details.CompilerNativizationOptions.ServerOnlyPlatform = Platform->IsServerOnly();
Details.CompilerNativizationOptions.bExcludeMonolithicHeaders = GetDefault<UProjectPackagingSettings>()->bExcludeMonolithicEngineHeadersInNativizedCode;
auto GatherExcludedStuff = [&](const TCHAR* KeyForExcludedModules, const TCHAR* KeyForExcludedPaths, const TCHAR* KeyForExcludedAssets)
{