Skip to content

Commit 3be0a72

Browse files
committed
Merge branch 'release/v0.3.2'
2 parents 0bf88cc + c9d5455 commit 3be0a72

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Assets/UnitySpineImporter/Scripts/Editor/Util/SpineUtil.cs

+2
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@ public static void addSlotAnimationToClip(AnimationClip
455455
foreach(KeyValuePair<string, SpineSlotAnimation> kvp in slotsAnimation){
456456
string slotName = kvp.Key;
457457
string defaultAttachment = spineData.slotDefaultAttachments[slotName];
458+
if (string.IsNullOrEmpty(defaultAttachment))
459+
continue;
458460
SpineSlotAnimation slotAnimation = kvp.Value;
459461
if (slotAnimation.attachment != null && slotAnimation.attachment.Count > 0){
460462
Dictionary<string, AnimationCurve> curveByName = new Dictionary<string, AnimationCurve>();

Assets/UnitySpineImporter/SharedScripts/Slot/Slot.cs

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public Slot (string bone, string slot, string attachment = null, Color32? color
4141
}
4242

4343
public void hideAllAttachments(){
44+
if (attachments == null)
45+
return;
4446
foreach(Attachment a in attachments){
4547
a.gameObject.SetActive(false);
4648
}

0 commit comments

Comments
 (0)