Merge branch 'master' into leonard

client_Wu Xijin

2018-11-01 cecdc26b2a4b290c0ee92366234b37f9bdc5499b

 Assets/Editor/Tool/BuiltInResourceSetting.cs

@@ -39,7 +39,7 @@
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
            }
@@ -87,7 +87,7 @@
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
            }