Merge branch '3.6' into 3.7-beta

This commit is contained in:
badlogic 2018-04-12 10:47:09 +02:00
commit 8594c67b7a
2 changed files with 4 additions and 0 deletions

View File

@ -158,6 +158,10 @@ package spine.starling {
}
a = slot.color.a * attachmentColor.a;
if (a == 0) {
clipper.clipEndWithSlot(slot);
continue;
}
rgb = Color.rgb(r * slot.color.r * attachmentColor.r, g * slot.color.g * attachmentColor.g, b * slot.color.b * attachmentColor.b);
if (slot.darkColor == null) dark = Color.rgb(0, 0, 0);
else dark = Color.rgb(slot.darkColor.r * 255, slot.darkColor.g * 255, slot.darkColor.b * 255);