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

Fixed loading linked meshes from JSON/binary when the source mesh is in a skin.

Browse Source
This commit is contained in:
NathanSweet 2016-04-01 22:33:31 +02:00
parent 55851f7699
commit 3607e32855
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java
View File

@ -189,6 +189,7 @@ public class SkeletonBinary {
Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin); Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin);
if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin); if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin);
Attachment parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent); Attachment parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent);
if (parent == null) throw new SerializationException("Parent mesh not found: " + linkedMesh.parent);
if (linkedMesh.mesh instanceof MeshAttachment) { if (linkedMesh.mesh instanceof MeshAttachment) {
MeshAttachment mesh = (MeshAttachment)linkedMesh.mesh; MeshAttachment mesh = (MeshAttachment)linkedMesh.mesh;
mesh.setParentMesh((MeshAttachment)parent); mesh.setParentMesh((MeshAttachment)parent);

1
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
View File

@ -203,6 +203,7 @@ public class SkeletonJson {
Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin); Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin);
if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin); if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin);
Attachment parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent); Attachment parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent);
if (parent == null) throw new SerializationException("Parent mesh not found: " + linkedMesh.parent);
if (linkedMesh.mesh instanceof MeshAttachment) { if (linkedMesh.mesh instanceof MeshAttachment) {
MeshAttachment mesh = (MeshAttachment)linkedMesh.mesh; MeshAttachment mesh = (MeshAttachment)linkedMesh.mesh;
mesh.setParentMesh((MeshAttachment)parent); mesh.setParentMesh((MeshAttachment)parent);