Merge branch '3.8-beta' into skin-bones

This commit is contained in:
badlogic 2019-05-31 11:34:09 +02:00
commit d14b5dc22a

View File

@ -120,7 +120,7 @@ namespace spine {
if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) { if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) {
RegionAttachment* attachment = (RegionAttachment*)slot->getAttachment(); RegionAttachment* attachment = (RegionAttachment*)slot->getAttachment();
texture = static_cast<AttachmentVertices*>(attachment->getRendererObject())->_texture; texture = static_cast<AttachmentVertices*>(attachment->getRendererObject())->_texture;
} else if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) { } else if (slot->getAttachment()->getRTTI().isExactly(MeshAttachment::rtti)) {
MeshAttachment* attachment = (MeshAttachment*)slot->getAttachment(); MeshAttachment* attachment = (MeshAttachment*)slot->getAttachment();
texture = static_cast<AttachmentVertices*>(attachment->getRendererObject())->_texture; texture = static_cast<AttachmentVertices*>(attachment->getRendererObject())->_texture;
} else { } else {