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

[c] Fix compilation errors due to new type hierarchy.

Browse Source
This commit is contained in:
Mario Zechner 2022-01-12 09:05:34 +01:00
parent 4a01ee2333
commit 5a541597cc
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-c/spine-c/src/spine/SkeletonBinary.c
View File

@ -1418,9 +1418,8 @@ spSkeletonData *spSkeletonBinary_readSkeletonData(spSkeletonBinary *self, const
_spSkeletonBinary_setError(self, "Parent mesh not found: ", linkedMesh->parent); _spSkeletonBinary_setError(self, "Parent mesh not found: ", linkedMesh->parent);
return NULL; return NULL;
} }
linkedMesh->mesh->super.timelineAttachment = linkedMesh->inheritDeform ? SUB_CAST(spVertexAttachment, parent) linkedMesh->mesh->super.timelineAttachment = linkedMesh->inheritDeform ? parent
: SUB_CAST(spVertexAttachment, : SUPER(SUPER(linkedMesh->mesh));
linkedMesh->mesh);
spMeshAttachment_setParentMesh(linkedMesh->mesh, SUB_CAST(spMeshAttachment, parent)); spMeshAttachment_setParentMesh(linkedMesh->mesh, SUB_CAST(spMeshAttachment, parent));
spMeshAttachment_updateRegion(linkedMesh->mesh); spMeshAttachment_updateRegion(linkedMesh->mesh);
spAttachmentLoader_configureAttachment(self->attachmentLoader, SUPER(SUPER(linkedMesh->mesh))); spAttachmentLoader_configureAttachment(self->attachmentLoader, SUPER(SUPER(linkedMesh->mesh)));

5
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -1514,9 +1514,8 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
_spSkeletonJson_setError(self, 0, "Parent mesh not found: ", linkedMesh->parent); _spSkeletonJson_setError(self, 0, "Parent mesh not found: ", linkedMesh->parent);
return NULL; return NULL;
} }
linkedMesh->mesh->super.timelineAttachment = linkedMesh->inheritDeform ? SUB_CAST(spVertexAttachment, parent) linkedMesh->mesh->super.timelineAttachment = linkedMesh->inheritDeform ? parent
: SUB_CAST(spVertexAttachment, : SUPER(SUPER(linkedMesh->mesh));
linkedMesh->mesh);
spMeshAttachment_setParentMesh(linkedMesh->mesh, SUB_CAST(spMeshAttachment, parent)); spMeshAttachment_setParentMesh(linkedMesh->mesh, SUB_CAST(spMeshAttachment, parent));
spMeshAttachment_updateRegion(linkedMesh->mesh); spMeshAttachment_updateRegion(linkedMesh->mesh);
spAttachmentLoader_configureAttachment(self->attachmentLoader, SUPER(SUPER(linkedMesh->mesh))); spAttachmentLoader_configureAttachment(self->attachmentLoader, SUPER(SUPER(linkedMesh->mesh)));

2
spine-c/spine-c/src/spine/VertexAttachment.c
View File

@ -35,7 +35,7 @@ static int nextID = 0;
void _spVertexAttachment_init(spVertexAttachment *attachment) { void _spVertexAttachment_init(spVertexAttachment *attachment) {
attachment->id = nextID++; attachment->id = nextID++;
attachment->timelineAttachment = attachment; attachment->timelineAttachment = SUPER(attachment);
} }
void _spVertexAttachment_deinit(spVertexAttachment *attachment) { void _spVertexAttachment_deinit(spVertexAttachment *attachment) {