Merge branch '4.1' into 4.2-beta

This commit is contained in:
Mario Zechner 2023-12-11 14:29:55 +01:00
commit c5d0b11807
4 changed files with 12 additions and 12 deletions

View File

@ -75,9 +75,9 @@ void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *rend
spSlot *slot = skeleton->drawOrder[i];
spAttachment *attachment = slot->attachment;
if (!attachment) {
spSkeletonClipping_clipEnd(clipper, slot);
continue;
}
spSkeletonClipping_clipEnd(clipper, slot);
continue;
}
// Early out if the slot color is 0 or the bone is not active
if (slot->color.a == 0 || !slot->bone->active) {

View File

@ -71,9 +71,9 @@ void SkeletonDrawable::draw(SDL_Renderer *renderer) {
Slot &slot = *skeleton->getDrawOrder()[i];
Attachment *attachment = slot.getAttachment();
if (!attachment) {
clipper.clipEnd(slot);
continue;
}
clipper.clipEnd(slot);
continue;
}
// Early out if the slot color is 0 or the bone is not active
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {

View File

@ -169,9 +169,9 @@ namespace spine {
spSlot *slot = skeleton->drawOrder[i];
spAttachment *attachment = slot->attachment;
if (!attachment) {
spSkeletonClipping_clipEnd(clipper, slot);
continue;
}
spSkeletonClipping_clipEnd(clipper, slot);
continue;
}
// Early out if slot is invisible
if (slot->color.a == 0 || !slot->bone->active) {

View File

@ -95,9 +95,9 @@ namespace spine {
Slot &slot = *skeleton->getDrawOrder()[i];
Attachment *attachment = slot.getAttachment();
if (!attachment) {
clipper.clipEnd(slot);
continue;
}
clipper.clipEnd(slot);
continue;
}
// Early out if the slot color is 0 or the bone is not active
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {