From 2b3d395e51c75bf8c81350800c9a077d18f267da Mon Sep 17 00:00:00 2001
From: Harald Csaszar <harald.csaszar@pixelcloudgames.com>
Date: Wed, 14 Jul 2021 12:36:51 +0200
Subject: [PATCH] [unity] Removed limitation of not importing assets from the
 `Packages` directory which caused problems on Unity 2019.1, but no longer on
 2019.4. Closes #1924.

---
 .../Editor/Utility/AssetUtility.cs            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
index 6b7bea539..c79747a7f 100644
--- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
+++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
@@ -47,6 +47,10 @@
 #define EXPOSES_SPRITE_ATLAS_UTILITIES
 #endif
 
+#if !UNITY_2019_4_OR_NEWER
+#define PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
+#endif
+
 using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
@@ -313,8 +317,10 @@ namespace Spine.Unity.Editor {
 			// Import atlases first.
 			var newAtlases = new List<AtlasAssetBase>();
 			foreach (string ap in atlasPaths) {
+			#if PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
 				if (ap.StartsWith("Packages"))
 					continue;
+			#endif
 				TextAsset atlasText = AssetDatabase.LoadAssetAtPath<TextAsset>(ap);
 				AtlasAssetBase atlas = IngestSpineAtlas(atlasText, texturesWithoutMetaFile);
 				newAtlases.Add(atlas);
@@ -327,8 +333,10 @@ namespace Spine.Unity.Editor {
 				string skeletonPath = skeletonPathEntry.path;
 				var compatibilityProblems = skeletonPathEntry.compatibilityProblems;
 				string otherProblemDescription = skeletonPathEntry.otherProblemDescription;
+			#if PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
 				if (skeletonPath.StartsWith("Packages"))
 					continue;
+			#endif
 				if (!reimport && CheckForValidSkeletonData(skeletonPath)) {
 					ReloadSkeletonData(skeletonPath, compatibilityProblems);
 					continue;
@@ -617,7 +625,7 @@ namespace Spine.Unity.Editor {
 		}
 
 		public static bool SpriteAtlasSettingsNeedAdjustment (UnityEngine.U2D.SpriteAtlas spriteAtlas) {
-		#if EXPOSES_SPRITE_ATLAS_UTILITIES
+#if EXPOSES_SPRITE_ATLAS_UTILITIES
 			UnityEditor.U2D.SpriteAtlasPackingSettings packingSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetPackingSettings(spriteAtlas);
 			UnityEditor.U2D.SpriteAtlasTextureSettings textureSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetTextureSettings(spriteAtlas);
 
@@ -628,13 +636,13 @@ namespace Spine.Unity.Editor {
 				textureSettings.generateMipMaps == false;
 			// note: platformSettings.textureCompression is always providing "Compressed", so we have to skip it.
 			return !areSettingsAsDesired;
-		#else
+#else
 			return false;
-		#endif
+#endif
 		}
 
 		public static bool AdjustSpriteAtlasSettings (UnityEngine.U2D.SpriteAtlas spriteAtlas) {
-		#if EXPOSES_SPRITE_ATLAS_UTILITIES
+#if EXPOSES_SPRITE_ATLAS_UTILITIES
 			UnityEditor.U2D.SpriteAtlasPackingSettings packingSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetPackingSettings(spriteAtlas);
 			UnityEditor.U2D.SpriteAtlasTextureSettings textureSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetTextureSettings(spriteAtlas);
 
@@ -654,9 +662,9 @@ namespace Spine.Unity.Editor {
 			string atlasPath = AssetDatabase.GetAssetPath(spriteAtlas);
 			Debug.Log(string.Format("Adjusted unsuitable SpriteAtlas settings '{0}'", atlasPath), spriteAtlas);
 			return false;
-		#else
+#else
 			return true;
-		#endif
+#endif
 		}
 
 		public static bool GeneratePngFromSpriteAtlas (UnityEngine.U2D.SpriteAtlas spriteAtlas, out string texturePath) {