Merge branch '4.1-beta' into 4.2-beta

This commit is contained in:
Mario Zechner 2022-02-02 12:40:12 +01:00
commit c6d01e98e8

View File

@ -497,8 +497,7 @@ bool AnimationState::apply(Skeleton &skeleton) {
Slot *slot = slots[i];
if (slot->getAttachmentState() == setupState) {
const String &attachmentName = slot->getData().getAttachmentName();
slot->setAttachment(attachmentName.isEmpty() ? NULL : skeleton.getAttachment(slot->getData().getIndex(),
attachmentName));
slot->setAttachment(attachmentName.isEmpty() ? NULL : skeleton.getAttachment(slot->getData().getIndex(), attachmentName));
}
}
_unkeyedState += 2;