mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '3.8' into 4.0-beta
This commit is contained in:
commit
893c3a25e4
@ -520,8 +520,8 @@ function AnimationState:applyAttachmentTimeline(timeline, skeleton, time, blend,
|
|||||||
frameIndex = zlen(frames) - 1;
|
frameIndex = zlen(frames) - 1;
|
||||||
else
|
else
|
||||||
frameIndex = Animation.binarySearch(frames, time, 1) - 1;
|
frameIndex = Animation.binarySearch(frames, time, 1) - 1;
|
||||||
self:setAttachment(skeleton, slot, timeline.attachmentNames[frameIndex], attachments)
|
|
||||||
end
|
end
|
||||||
|
self:setAttachment(skeleton, slot, timeline.attachmentNames[frameIndex], attachments)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- If an attachment wasn't set (ie before the first frame or attachments is false), set the setup attachment later.
|
-- If an attachment wasn't set (ie before the first frame or attachments is false), set the setup attachment later.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user