Browse Source

Merge branch '3.8' into 3.9-beta

badlogic 5 years ago
parent
commit
2e034226d3
2 changed files with 1527 additions and 1287 deletions
  1. 1524 1285
      spine-corona/mobdebug.lua
  2. 3 2
      spine-corona/spine-corona/spine.lua

File diff suppressed because it is too large
+ 1524 - 1285
spine-corona/mobdebug.lua


+ 3 - 2
spine-corona/spine-corona/spine.lua

@@ -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
-					if premultipliedAlpha then multiplier = 1 end
+					local multiplier = 1
+					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,

Some files were not shown because too many files changed in this diff