mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-03 06:09:09 +08:00
[csharp] More skin API changes, ports of commits 8d0ffd0 and 829fcc4. See #841.
This commit is contained in:
parent
7249fd6e4d
commit
42da1973e4
@ -164,7 +164,6 @@ namespace Spine {
|
|||||||
copy.g = g;
|
copy.g = g;
|
||||||
copy.b = b;
|
copy.b = b;
|
||||||
copy.a = a;
|
copy.a = a;
|
||||||
copy.deformAttachment = deformAttachment;
|
|
||||||
|
|
||||||
CopyTo(copy);
|
CopyTo(copy);
|
||||||
copy.regionUVs = new float[regionUVs.Length];
|
copy.regionUVs = new float[regionUVs.Length];
|
||||||
|
|||||||
@ -150,6 +150,7 @@ namespace Spine {
|
|||||||
attachment.vertices = null;
|
attachment.vertices = null;
|
||||||
|
|
||||||
attachment.worldVerticesLength = worldVerticesLength;
|
attachment.worldVerticesLength = worldVerticesLength;
|
||||||
|
attachment.deformAttachment = deformAttachment;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,9 +83,10 @@ namespace Spine {
|
|||||||
|
|
||||||
foreach (SkinEntry entry in skin.attachments.Keys) {
|
foreach (SkinEntry entry in skin.attachments.Keys) {
|
||||||
if (entry.Attachment is MeshAttachment)
|
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
|
else
|
||||||
SetAttachment(entry.SlotIndex, entry.Name, entry.Attachment.Copy());
|
SetAttachment(entry.SlotIndex, entry.Name, entry.Attachment != null ? entry.Attachment.Copy() : null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user