UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-05 02:06:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2840
spine-corona/mobdebug.lua
View File

File diff suppressed because it is too large Load Diff

5
spine-corona/spine-corona/spine.lua
View File

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