UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed code where a default skin was assumed to exist (which is no longer the case). Fixes an error at SkeletonDataAsset inspector -> show slots -> show attachments. Closes #1453.

Browse Source
This commit is contained in:
Harald Csaszar 2019-08-19 11:48:16 +02:00
parent be77b0c93d
commit a2393e8a12
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs
View File

@ -170,6 +170,7 @@ namespace Spine.Unity.Examples {
if (skinName != "") if (skinName != "")
skin = skeletonData.FindSkin(skinName); skin = skeletonData.FindSkin(skinName);
if (skin != null)
skin.SetAttachment(slotIndex, att.Name, att); skin.SetAttachment(slotIndex, att.Name, att);
return att; return att;

5
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs
View File

@ -497,13 +497,16 @@ namespace Spine.Unity.Editor {
using (new SpineInspectorUtility.IndentScope()) { using (new SpineInspectorUtility.IndentScope()) {
{ {
skin.GetAttachments(i, slotAttachments); skin.GetAttachments(i, slotAttachments);
if (defaultSkin != null) {
if (skin != defaultSkin) { if (skin != defaultSkin) {
defaultSkin.GetAttachments(i, slotAttachments); defaultSkin.GetAttachments(i, slotAttachments);
defaultSkin.GetAttachments(i, defaultSkinAttachments); defaultSkin.GetAttachments(i, defaultSkinAttachments);
} else { }
else {
defaultSkin.GetAttachments(i, defaultSkinAttachments); defaultSkin.GetAttachments(i, defaultSkinAttachments);
} }
} }
}
for (int a = 0; a < slotAttachments.Count; a++) { for (int a = 0; a < slotAttachments.Count; a++) {
var skinEntry = slotAttachments[a]; var skinEntry = slotAttachments[a];

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs
View File

@ -582,7 +582,7 @@ namespace Spine.Unity.Editor {
attachmentTable.Add(skeleton.Slots.Items[i], attachments); attachmentTable.Add(skeleton.Slots.Items[i], attachments);
// Add skin attachments. // Add skin attachments.
skin.GetAttachments(i, attachments); skin.GetAttachments(i, attachments);
if (notDefaultSkin) // Add default skin attachments. if (notDefaultSkin && defaultSkin != null) // Add default skin attachments.
defaultSkin.GetAttachments(i, attachments); defaultSkin.GetAttachments(i, attachments);
} }

2
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkinUtilities.cs
View File

@ -58,7 +58,7 @@ namespace Spine.Unity.AttachmentTools {
var defaultSkin = skeleton.data.DefaultSkin; var defaultSkin = skeleton.data.DefaultSkin;
var activeSkin = skeleton.skin; var activeSkin = skeleton.skin;
if (includeDefaultSkin) if (includeDefaultSkin && defaultSkin != null)
defaultSkin.CopyTo(newSkin, true, cloneAttachments, cloneMeshesAsLinked); defaultSkin.CopyTo(newSkin, true, cloneAttachments, cloneMeshesAsLinked);
if (activeSkin != null) if (activeSkin != null)