From 5a738334161bd36adcc0baef0d9a8760246c94f5 Mon Sep 17 00:00:00 2001 From: pharan Date: Sat, 25 Aug 2018 05:54:51 +0800 Subject: [PATCH 1/2] [unity] Fix GetRemappedClone not using sourceMaterial when non-pma. --- .../spine-unity/Modules/AttachmentTools/AttachmentTools.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs b/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs index 601f06685..344de6b17 100644 --- a/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs +++ b/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs @@ -1089,7 +1089,7 @@ namespace Spine.Unity.Modules.AttachmentTools { /// If true MeshAttachments will be cloned as linked meshes and will inherit animation from the original attachment. /// If true the size of the original attachment will be followed, instead of using the Sprite size. public static Attachment GetRemappedClone (this Attachment o, Sprite sprite, Material sourceMaterial, bool premultiplyAlpha = true, bool cloneMeshAsLinked = true, bool useOriginalRegionSize = false) { - var atlasRegion = premultiplyAlpha ? sprite.ToAtlasRegionPMAClone(sourceMaterial) : sprite.ToAtlasRegion(false); + var atlasRegion = premultiplyAlpha ? sprite.ToAtlasRegionPMAClone(sourceMaterial) : sprite.ToAtlasRegion(new Material(sourceMaterial) { mainTexture = sprite.texture }); return o.GetRemappedClone(atlasRegion, cloneMeshAsLinked, useOriginalRegionSize, 1f/sprite.pixelsPerUnit); } From 3a1aedc035bb30278f641b61efa58b546ed4394c Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 5 Sep 2018 15:22:08 +0200 Subject: [PATCH 2/2] [c] Json parser was missing parsing of points in skins. See #1168 --- spine-c/spine-c/src/spine/SkeletonJson.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c index 16428ddf7..7309895f1 100644 --- a/spine-c/spine-c/src/spine/SkeletonJson.c +++ b/spine-c/spine-c/src/spine/SkeletonJson.c @@ -891,6 +891,8 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha type = SP_ATTACHMENT_PATH; else if (strcmp(typeString, "clipping") == 0) type = SP_ATTACHMENT_CLIPPING; + else if (strcmp(typeString, "point") == 0) + type = SP_ATTACHMENT_POINT; else { spSkeletonData_dispose(skeletonData); _spSkeletonJson_setError(self, root, "Unknown attachment type: ", typeString);