Merge branch '3.6' into 3.7-beta

This commit is contained in:
badlogic 2017-07-17 14:26:22 +02:00
commit 2ca3d99e28

View File

@ -281,6 +281,9 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t
}
color.a *= nodeColor.a * _skeleton->color.a * slot->color.a * 255;
// skip rendering if the color of this attachment is 0
if (color.a == 0)
continue;
float multiplier = _premultipliedAlpha ? color.a : 255;
color.r *= nodeColor.r * _skeleton->color.r * slot->color.r * multiplier;
color.g *= nodeColor.g * _skeleton->color.g * slot->color.g * multiplier;