mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-04 22:34:53 +08:00
Merge branch '3.8' into 3.9-beta
This commit is contained in:
commit
2e034226d3
File diff suppressed because it is too large
Load Diff
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user