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

#rb None
#jira 0

[CL 5396125 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2019-03-14 00:59:16 -04:00
parent 0507eaf772
commit 9d2ebe90d2
21046 changed files with 2740661 additions and 599033 deletions

View File

@@ -130,7 +130,7 @@ class FTextureFormatAndroid : public ITextureFormat
{
virtual bool AllowParallelBuild() const override
{
return true;
return !PLATFORM_MAC; // On Mac Qualcomm's TextureConverter library is not thead-safe
}
virtual uint16 GetVersion(