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

#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
This commit is contained in:
Chris Gagnon
2019-02-21 13:05:30 -05:00
parent af33ef1517
commit 80918bea22
13849 changed files with 1880281 additions and 133480 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(