[csharp] More skin API changes, ports of commits 8d0ffd0 and 829fcc4. See #841.

This commit is contained in:
Harald Csaszar 2019-06-03 16:45:46 +02:00
parent 7249fd6e4d
commit 42da1973e4
3 changed files with 5 additions and 4 deletions

View File

@ -164,8 +164,7 @@ namespace Spine {
copy.g = g;
copy.b = b;
copy.a = a;
copy.deformAttachment = deformAttachment;
CopyTo(copy);
copy.regionUVs = new float[regionUVs.Length];
Array.Copy(regionUVs, 0, copy.regionUVs, 0, regionUVs.Length);

View File

@ -150,6 +150,7 @@ namespace Spine {
attachment.vertices = null;
attachment.worldVerticesLength = worldVerticesLength;
attachment.deformAttachment = deformAttachment;
}
}
}

View File

@ -83,9 +83,10 @@ namespace Spine {
foreach (SkinEntry entry in skin.attachments.Keys) {
if (entry.Attachment is MeshAttachment)
SetAttachment(entry.SlotIndex, entry.Name, ((MeshAttachment)entry.Attachment).NewLinkedMesh());
SetAttachment(entry.SlotIndex, entry.Name,
entry.Attachment != null ? ((MeshAttachment)entry.Attachment).NewLinkedMesh() : null);
else
SetAttachment(entry.SlotIndex, entry.Name, entry.Attachment.Copy());
SetAttachment(entry.SlotIndex, entry.Name, entry.Attachment != null ? entry.Attachment.Copy() : null);
}
}