|
@@ -415,14 +415,14 @@ function Animation.AttachmentTimeline.new ()
|
|
local attachmentName = self.attachmentNames[frameIndex]
|
|
local attachmentName = self.attachmentNames[frameIndex]
|
|
local slot = skeleton.slotsByName[self.slotName]
|
|
local slot = skeleton.slotsByName[self.slotName]
|
|
if attachmentName then
|
|
if attachmentName then
|
|
- if not slot.attachment then
|
|
|
|
- slot:setAttachment(skeleton:getAttachment(self.slotName, attachmentName))
|
|
|
|
- elseif slot.attachment.name ~= attachmentName then
|
|
|
|
- slot:setAttachment(skeleton:getAttachment(self.slotName, attachmentName))
|
|
|
|
- end
|
|
|
|
|
|
+ if not slot.attachment then
|
|
|
|
+ slot:setAttachment(skeleton:getAttachment(self.slotName, attachmentName))
|
|
|
|
+ elseif slot.attachment.name ~= attachmentName then
|
|
|
|
+ slot:setAttachment(skeleton:getAttachment(self.slotName, attachmentName))
|
|
|
|
+ end
|
|
|
|
+ else
|
|
|
|
+ slot:setAttachment(nil)
|
|
end
|
|
end
|
|
-
|
|
|
|
-
|
|
|
|
end
|
|
end
|
|
|
|
|
|
return self
|
|
return self
|