From 7a789752acb657e163950cbc77fea5833de51685 Mon Sep 17 00:00:00 2001
From: Harald Csaszar <harald.csaszar@pixelcloudgames.com>
Date: Thu, 15 Aug 2019 14:12:55 +0200
Subject: [PATCH] [unity] Fixed GetRepackedSkin ignoring whitespace stripping.
 Closes #1399.

---
 .../Runtime/spine-unity/Utility/AtlasUtilities.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 70e55c0f7..933bf89e6 100644
--- a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs
+++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs
@@ -289,7 +289,8 @@ namespace Spine.Unity.AttachmentTools {
 			var repackedRegions = new List<AtlasRegion>();
 			for (int i = 0, n = originalRegions.Count; i < n; i++) {
 				var oldRegion = originalRegions[i];
-				var newRegion = UVRectToAtlasRegion(rects[i], oldRegion.name, page, oldRegion.offsetX, oldRegion.offsetY, oldRegion.rotate);
+				var newRegion = UVRectToAtlasRegion(rects[i], oldRegion.name, page, oldRegion.offsetX, oldRegion.offsetY,
+					oldRegion.rotate, oldRegion.originalWidth, oldRegion.originalHeight);
 				repackedRegions.Add(newRegion);
 			}
 
@@ -381,7 +382,8 @@ namespace Spine.Unity.AttachmentTools {
 			var repackedRegions = new List<AtlasRegion>();
 			for (int i = 0, n = originalRegions.Count; i < n; i++) {
 				var oldRegion = originalRegions[i];
-				var newRegion = UVRectToAtlasRegion(rects[i], oldRegion.name, page, oldRegion.offsetX, oldRegion.offsetY, oldRegion.rotate);
+				var newRegion = UVRectToAtlasRegion(rects[i], oldRegion.name, page, oldRegion.offsetX, oldRegion.offsetY,
+					oldRegion.rotate, oldRegion.originalWidth, oldRegion.originalHeight);
 				repackedRegions.Add(newRegion);
 			}
 
@@ -424,7 +426,7 @@ namespace Spine.Unity.AttachmentTools {
 			CachedRegionTextures.TryGetValue(ar, out output);
 			if (output == null) {
 				Texture2D sourceTexture = ar.GetMainTexture();
-				Rect r = ar.GetUnityRect(sourceTexture.height);
+				Rect r = ar.GetUnityRect();
 				int width = (int)r.width;
 				int height = (int)r.height;
 				output = new Texture2D(width, height, textureFormat, mipmaps) { name = ar.name };
@@ -516,7 +518,8 @@ namespace Spine.Unity.AttachmentTools {
 
 		/// <summary>
 		/// Creates a new Spine AtlasRegion according to a Unity UV Rect (x-right, y-up, uv-normalized).</summary>
-		static AtlasRegion UVRectToAtlasRegion (Rect uvRect, string name, AtlasPage page, float offsetX, float offsetY, bool rotate) {			
+		static AtlasRegion UVRectToAtlasRegion (Rect uvRect, string name, AtlasPage page, float offsetX, float offsetY, bool rotate,
+												int originalWidth, int originalHeight) {
 			var tr  = UVRectToTextureRect(uvRect, page.width, page.height);
 			var rr = tr.SpineUnityFlipRect(page.height);
 
@@ -542,9 +545,9 @@ namespace Spine.Unity.AttachmentTools {
 				index = -1,
 
 				width = w,
-				originalWidth = w,
+				originalWidth = originalWidth,
 				height = h,
-				originalHeight = h,
+				originalHeight = originalHeight,
 				offsetX = offsetX,
 				offsetY = offsetY,
 				x = x,