mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '4.1' into 4.2-beta
This commit is contained in:
commit
c5d0b11807
@ -75,9 +75,9 @@ void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *rend
|
|||||||
spSlot *slot = skeleton->drawOrder[i];
|
spSlot *slot = skeleton->drawOrder[i];
|
||||||
spAttachment *attachment = slot->attachment;
|
spAttachment *attachment = slot->attachment;
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
spSkeletonClipping_clipEnd(clipper, slot);
|
spSkeletonClipping_clipEnd(clipper, slot);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Early out if the slot color is 0 or the bone is not active
|
// Early out if the slot color is 0 or the bone is not active
|
||||||
if (slot->color.a == 0 || !slot->bone->active) {
|
if (slot->color.a == 0 || !slot->bone->active) {
|
||||||
|
|||||||
@ -71,9 +71,9 @@ void SkeletonDrawable::draw(SDL_Renderer *renderer) {
|
|||||||
Slot &slot = *skeleton->getDrawOrder()[i];
|
Slot &slot = *skeleton->getDrawOrder()[i];
|
||||||
Attachment *attachment = slot.getAttachment();
|
Attachment *attachment = slot.getAttachment();
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
clipper.clipEnd(slot);
|
clipper.clipEnd(slot);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Early out if the slot color is 0 or the bone is not active
|
// Early out if the slot color is 0 or the bone is not active
|
||||||
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {
|
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {
|
||||||
|
|||||||
@ -169,9 +169,9 @@ namespace spine {
|
|||||||
spSlot *slot = skeleton->drawOrder[i];
|
spSlot *slot = skeleton->drawOrder[i];
|
||||||
spAttachment *attachment = slot->attachment;
|
spAttachment *attachment = slot->attachment;
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
spSkeletonClipping_clipEnd(clipper, slot);
|
spSkeletonClipping_clipEnd(clipper, slot);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Early out if slot is invisible
|
// Early out if slot is invisible
|
||||||
if (slot->color.a == 0 || !slot->bone->active) {
|
if (slot->color.a == 0 || !slot->bone->active) {
|
||||||
|
|||||||
@ -95,9 +95,9 @@ namespace spine {
|
|||||||
Slot &slot = *skeleton->getDrawOrder()[i];
|
Slot &slot = *skeleton->getDrawOrder()[i];
|
||||||
Attachment *attachment = slot.getAttachment();
|
Attachment *attachment = slot.getAttachment();
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
clipper.clipEnd(slot);
|
clipper.clipEnd(slot);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Early out if the slot color is 0 or the bone is not active
|
// Early out if the slot color is 0 or the bone is not active
|
||||||
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {
|
if (slot.getColor().a == 0 || !slot.getBone().isActive()) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user