Merge branch '3.8' into 3.9-beta

This commit is contained in:
badlogic 2019-10-15 16:16:43 +02:00
commit 2e034226d3
2 changed files with 1542 additions and 1303 deletions

File diff suppressed because it is too large Load Diff

View File

@ -191,8 +191,9 @@ function spine.Skeleton:updateWorldTransform()
local slotColor = slot.color
local attachmentColor = attachment.color
local alpha = skeletonColor.a * slotColor.a * attachmentColor.a
local multiplier = alpha
if premultipliedAlpha then multiplier = 1 end
local multiplier = 1
if premultipliedAlpha then multiplier = alpha end
color:set(skeletonColor.r * slotColor.r * attachmentColor.r * multiplier,
skeletonColor.g * slotColor.g * attachmentColor.g * multiplier,
skeletonColor.b * slotColor.b * attachmentColor.b * multiplier,