Merge branch 'release/v0.3.2'

nicloay · May 23, 2014 · 3be0a72 · 3be0a72
2 parents 0bf88cc + c9d5455
commit 3be0a72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Assets/UnitySpineImporter/Scripts/Editor/Util/SpineUtil.cs b/Assets/UnitySpineImporter/Scripts/Editor/Util/SpineUtil.cs
@@ -455,6 +455,8 @@ public static void addSlotAnimationToClip(AnimationClip
 			foreach(KeyValuePair<string, SpineSlotAnimation> kvp in slotsAnimation){
 				string slotName = kvp.Key;
 				string defaultAttachment = spineData.slotDefaultAttachments[slotName];
+				if (string.IsNullOrEmpty(defaultAttachment))
+					continue;
 				SpineSlotAnimation slotAnimation = kvp.Value;
 				if (slotAnimation.attachment != null && slotAnimation.attachment.Count > 0){
 					Dictionary<string, AnimationCurve> curveByName = new Dictionary<string, AnimationCurve>();

diff --git a/Assets/UnitySpineImporter/SharedScripts/Slot/Slot.cs b/Assets/UnitySpineImporter/SharedScripts/Slot/Slot.cs
@@ -41,6 +41,8 @@ public Slot (string bone, string slot, string attachment = null, Color32? color
 		}
 
 		public void hideAllAttachments(){
+			if (attachments == null)
+				return;
 			foreach(Attachment a in attachments){
 				a.gameObject.SetActive(false);
 			}