From ebd8831a176b11f29ed0194a37c36e542383a122 Mon Sep 17 00:00:00 2001
From: pharan <johndygit@live.com.ph>
Date: Mon, 4 Jul 2016 13:58:34 +0800
Subject: [PATCH] [spine-unity] 3.3 changes to TK2D code + better default
 scale.

---
 .../Asset Types/SkeletonDataAsset.cs          |  4 +++-
 .../Editor/SpineEditorUtilities.cs            |  4 ++++
 .../TK2D/SpriteCollectionAttachmentLoader.cs  | 24 ++++---------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/spine-unity/Assets/spine-unity/Asset Types/SkeletonDataAsset.cs b/spine-unity/Assets/spine-unity/Asset Types/SkeletonDataAsset.cs
index 499ec80f2..da8629261 100644
--- a/spine-unity/Assets/spine-unity/Asset Types/SkeletonDataAsset.cs	
+++ b/spine-unity/Assets/spine-unity/Asset Types/SkeletonDataAsset.cs	
@@ -39,9 +39,11 @@ namespace Spine.Unity {
 		public AtlasAsset[] atlasAssets;
 		#if SPINE_TK2D
 		public tk2dSpriteCollectionData spriteCollection;
+		public float scale = 1f;
+		#else
+		public float scale = 0.01f;
 		#endif
 		public TextAsset skeletonJSON;
-		public float scale = 0.01f;
 		public String[] fromAnimation;
 		public String[] toAnimation;
 		public float[] duration;
diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
index b08e097ad..b5aed4ad5 100644
--- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
+++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
@@ -154,7 +154,11 @@ namespace Spine.Unity.Editor {
 		static Dictionary<int, BoundingBoxFollower> boundingBoxFollowerTable;
 
 		const string DEFAULT_MIX_KEY = "SPINE_DEFAULT_MIX";
+		#if SPINE_TK2D
+		public static float defaultScale = 1f;
+		#else
 		public static float defaultScale = 0.01f;
+		#endif
 		public static float defaultMix = 0.2f;
 		public static string defaultShader = "Spine/Skeleton";
 
diff --git a/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs b/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs
index 3c6097de6..0f3b559cf 100644
--- a/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs
+++ b/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs
@@ -138,29 +138,13 @@ namespace Spine.Unity.TK2D {
 			return mesh;
 		}
 
-		public WeightedMeshAttachment NewWeightedMeshAttachment (Skin skin, String name, String path) {
-			ProcessSpriteDefinition(path);
-
-			WeightedMeshAttachment mesh = new WeightedMeshAttachment(name);
-			mesh.Path = path;
-			mesh.RendererObject = material;
-			mesh.RegionU = u;
-			mesh.RegionV = v;
-			mesh.RegionU2 = u2;
-			mesh.RegionV2 = v2;
-			mesh.RegionRotate = regionRotated;
-			mesh.RegionOriginalWidth = regionOriginalWidth;
-			mesh.RegionOriginalHeight = regionOriginalHeight;
-			mesh.RegionWidth = regionWidth;
-			mesh.RegionHeight = regionHeight;
-			mesh.RegionOffsetX = regionOffsetX;
-			mesh.RegionOffsetY = regionOffsetY;
-			return mesh;
-		}
-
 		public BoundingBoxAttachment NewBoundingBoxAttachment (Skin skin, String name) {
 			return new BoundingBoxAttachment(name);
 		}
+
+		public PathAttachment NewPathAttachment (Skin skin, string name) {
+			return new PathAttachment(name);
+		}
 	}
 }
 #endif