From b79316de81ded13390d72f2695519214ff6685d3 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 18 Jul 2022 13:16:14 +0200 Subject: [PATCH] [unity] Fixed skeleton import and Inspector behaviour of TK2D integration on 4.1. See #2113. --- .../Editor/Asset Types/SkeletonDataAssetInspector.cs | 2 +- .../Modules/TK2D/SpriteCollectionAttachmentLoader.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs index 0a1312791..bde3b42fc 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs @@ -193,7 +193,7 @@ namespace Spine.Unity.Editor { } if (changeCheck.changed) { - if (requiresReload || serializedObject.ApplyModifiedProperties()) { + if (serializedObject.ApplyModifiedProperties() || requiresReload) { this.Clear(); this.InitializeEditor(); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs index cdad5f491..0a5cec5d1 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs @@ -105,7 +105,7 @@ namespace Spine.Unity.TK2D { page.rendererObject = material; region.page = page; region.u = u; - region.u = v; + region.v = v; region.u2 = u2; region.v2 = v2; region.rotate = regionRotated;