From 28ab23d6d0e9bacc42a6870604aa36955e017508 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 18 Jan 2020 16:57:21 +0100 Subject: [PATCH 1/2] [unity] minor - fixed method comment closing tag. --- .../Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs index 15ba5543a..59a2f639e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs @@ -329,7 +329,6 @@ namespace Spine.Unity.AttachmentTools { /// is assumed at every additional Texture element. /// When e.g. packing the main texture and normal maps, pass 'new bool[] { true }' at this parameter, because normal maps use /// linear color space. - /// public static Skin GetRepackedSkin (this Skin o, string newName, Material materialPropertySource, out Material outputMaterial, out Texture2D outputTexture, int maxAtlasSize = 1024, int padding = 2, TextureFormat textureFormat = SpineTextureFormat, bool mipmaps = UseMipMaps, bool useOriginalNonrenderables = true, bool clearCache = false, From c5681698217201e93fd84fc849256753e8bb36ae Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 21 Jan 2020 13:40:52 +0100 Subject: [PATCH 2/2] [unity] Fixed `BoneFollowerGraphic` throwing null reference exception if it has no Canvas parent. Closes #1603. --- .../spine-unity/Components/Following/BoneFollowerGraphic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs index 8971f341d..989e79c28 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs @@ -131,7 +131,7 @@ namespace Spine.Unity { var canvas = skeletonGraphic.canvas; if (canvas == null) canvas = skeletonGraphic.GetComponentInParent(); - float scale = canvas.referencePixelsPerUnit; + float scale = canvas != null ? canvas.referencePixelsPerUnit : 100.0f; if (skeletonTransformIsParent) { // Recommended setup: Use local transform properties if Spine GameObject is the immediate parent