Merge branch '3.8' into 4.0-beta

This commit is contained in:
badlogic 2020-08-26 16:26:39 +02:00
commit 893c3a25e4

View File

@ -520,8 +520,8 @@ function AnimationState:applyAttachmentTimeline(timeline, skeleton, time, blend,
frameIndex = zlen(frames) - 1;
else
frameIndex = Animation.binarySearch(frames, time, 1) - 1;
self:setAttachment(skeleton, slot, timeline.attachmentNames[frameIndex], attachments)
end
self:setAttachment(skeleton, slot, timeline.attachmentNames[frameIndex], attachments)
end
-- If an attachment wasn't set (ie before the first frame or attachments is false), set the setup attachment later.