From 845773671e22e132e54814a10059cc4768ba80ef Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 16 May 2025 16:02:28 +0200 Subject: [PATCH] [unity] Fixed compile error of last commit fb8bc40 on Unity 2017. See #2851. --- .../spine-unity/Asset Types/SkeletonDataAsset.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs index e4c3c002d..c48ec0372 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs @@ -40,7 +40,9 @@ using System; using System.Collections.Generic; using System.IO; +#if UNSAFE_DIRECT_ACCESS_TEXT_ASSET_DATA using Unity.Collections; +#endif using UnityEngine; using CompatibilityProblemInfo = Spine.Unity.SkeletonDataCompatibility.CompatibilityProblemInfo; @@ -61,7 +63,7 @@ namespace Spine.Unity { [CreateAssetMenu(fileName = "New SkeletonDataAsset", menuName = "Spine/SkeletonData Asset")] public class SkeletonDataAsset : ScriptableObject { - #region Inspector +#region Inspector public AtlasAssetBase[] atlasAssets = new AtlasAssetBase[0]; #if SPINE_TK2D @@ -95,12 +97,12 @@ namespace Spine.Unity { void Reset () { Clear(); } - #endregion +#endregion SkeletonData skeletonData; AnimationStateData stateData; - #region Runtime Instantiation +#region Runtime Instantiation /// /// Creates a runtime SkeletonDataAsset. public static SkeletonDataAsset CreateRuntimeInstance (TextAsset skeletonDataFile, AtlasAssetBase atlasAsset, bool initialize, float scale = 0.01f) { @@ -135,7 +137,7 @@ namespace Spine.Unity { Clear(); GetSkeletonData(true); } - #endregion +#endregion /// Clears the loaded SkeletonData and AnimationStateData. Use this to force a reload for the next time GetSkeletonData is called. public void Clear () {