From 7d8c2a8771650dbf4ef9b7a0132d93cc1663a690 Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 15 May 2017 12:49:23 +0800 Subject: [PATCH] [unity] Minor formatting changes. --- .../spine-unity/Modules/AttachmentTools/AttachmentTools.cs | 2 +- .../Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs b/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs index d19c1c53b..7a4e17fc2 100644 --- a/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs +++ b/spine-unity/Assets/spine-unity/Modules/AttachmentTools/AttachmentTools.cs @@ -413,6 +413,7 @@ namespace Spine.Unity.Modules.AttachmentTools { foreach (var kvp in skinAttachments) { var newAttachment = kvp.Value.GetClone(true); if (IsRenderable(newAttachment)) { + var region = newAttachment.GetAtlasRegion(); int existingIndex; if (existingRegions.TryGetValue(region, out existingIndex)) { @@ -498,7 +499,6 @@ namespace Spine.Unity.Modules.AttachmentTools { var r = s.textureRect; var spritePixels = spriteTexture.GetPixels((int)r.x, (int)r.y, (int)r.width, (int)r.height); var newTexture = new Texture2D((int)r.width, (int)r.height, textureFormat, mipmaps); - newTexture.SetPixels(spritePixels); if (applyImmediately) diff --git a/spine-unity/Assets/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader b/spine-unity/Assets/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader index 0851c0c34..235d76cb8 100644 --- a/spine-unity/Assets/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader +++ b/spine-unity/Assets/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader @@ -5,7 +5,7 @@ Shader "Spine/Special/SkeletonGhost" { Properties { _Color ("Main Color", Color) = (1,1,1,1) - _MainTex ("Base (RGB) Alpha (A)", 2D) = "white" {} + [NoScaleOffset] _MainTex ("Base (RGB) Alpha (A)", 2D) = "white" {} _TextureFade ("Texture Fade Out", Range(0,1)) = 0 } SubShader {