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

Back out changelist 12737759 - CIS Errors

Browse Source 
[FYI] Jian.Ru, Alexis.Matte,Uriel.Doyon

#ROBOMERGE-SOURCE: CL 12739054 via CL 12739055 via CL 12739056
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12739058 by stan hormell in Main branch]
This commit is contained in:
stan hormell
2020-04-10 22:14:39 -04:00
parent 4345921b9d
commit d056616808
18 changed files with 158 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Engine/Source/Developer/Android/AndroidTargetPlatform/Private/AndroidTargetPlatform.cpp
View File

@@ -199,6 +199,7 @@ FAndroidTargetPlatform::FAndroidTargetPlatform(bool bInIsClient )
FConfigCacheIni::LoadLocalIniFile(EngineSettings, TEXT("Engine"), true, *IniPlatformName());
TextureLODSettings = nullptr; // These are registered by the device profile system.
StaticMeshLODSettings.Initialize(EngineSettings);
SkeletalMeshDefaultLODStreamingSettings.Initialize(EngineSettings);
#endif
TickDelegate = FTickerDelegate::CreateRaw(this, &FAndroidTargetPlatform::HandleTicker);
@@ -426,6 +427,12 @@ const FStaticMeshLODSettings& FAndroidTargetPlatform::GetStaticMeshLODSettings(
}
const FSkeletalMeshDefaultLODStreamingSettings& FAndroidTargetPlatform::GetSkeletalMeshDefaultLODStreamingSettings() const
{
return SkeletalMeshDefaultLODStreamingSettings;
}
void FAndroidTargetPlatform::GetTextureFormats( const UTexture* InTexture, TArray< TArray<FName> >& OutFormats) const
{
#if WITH_EDITOR