diff --git a/spine-c/src/spine/Slot.c b/spine-c/src/spine/Slot.c index bab8b5b43..8e4fcbf65 100644 --- a/spine-c/src/spine/Slot.c +++ b/spine-c/src/spine/Slot.c @@ -51,11 +51,12 @@ void spSlot_dispose (spSlot* self) { void spSlot_setAttachment (spSlot* self, spAttachment* attachment) { CONST_CAST(spAttachment*, self->attachment) = attachment; - SUB_CAST(_spSlot, self) ->attachmentTime = self->bone->skeleton->time; + SUB_CAST(_spSlot, self)->attachmentTime = self->bone->skeleton->time; + self->attachmentVerticesCount = 0; } void spSlot_setAttachmentTime (spSlot* self, float time) { - SUB_CAST(_spSlot, self) ->attachmentTime = self->bone->skeleton->time - time; + SUB_CAST(_spSlot, self)->attachmentTime = self->bone->skeleton->time - time; } float spSlot_getAttachmentTime (const spSlot* self) { @@ -64,6 +65,7 @@ float spSlot_getAttachmentTime (const spSlot* self) { void spSlot_setToSetupPose (spSlot* self) { spAttachment* attachment = 0; + self->r = self->data->r; self->g = self->data->g; self->b = self->data->b; diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Slot.java b/spine-libgdx/src/com/esotericsoftware/spine/Slot.java index 9990dbc2e..3773be54a 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Slot.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Slot.java @@ -119,7 +119,6 @@ public class Slot { void setToSetupPose (int slotIndex) { color.set(data.color); setAttachment(data.attachmentName == null ? null : bone.skeleton.getAttachment(slotIndex, data.attachmentName)); - attachmentVertices.clear(); } public void setToSetupPose () {