Merge branch '3.8' into 3.9-beta

This commit is contained in:
Harald Csaszar 2020-02-06 19:02:43 +01:00
commit d8af0d3d24

View File

@ -594,7 +594,7 @@ namespace Spine.Unity.Editor {
static bool SetReferenceTextureSettings (string texturePath, SpineAtlasAsset atlasAsset, string referenceAssetPath) {
TextureImporter reference = TextureImporter.GetAtPath(referenceAssetPath) as TextureImporter;
if (reference == null)
SetDefaultTextureSettings(texturePath, atlasAsset);
return SetDefaultTextureSettings(texturePath, atlasAsset);
TextureImporter texImporter = (TextureImporter)TextureImporter.GetAtPath(texturePath);
if (texImporter == null) {
@ -612,6 +612,7 @@ namespace Spine.Unity.Editor {
texImporter.isReadable = reference.isReadable;
texImporter.filterMode = reference.filterMode;
texImporter.mipmapFilter = reference.mipmapFilter;
texImporter.textureType = reference.textureType;
EditorUtility.SetDirty(texImporter);
AssetDatabase.ImportAsset(texturePath);