diff --git a/spine-cpp/spine-cpp/include/spine/Skeleton.h b/spine-cpp/spine-cpp/include/spine/Skeleton.h index 35026d25a..7d62fc910 100644 --- a/spine-cpp/spine-cpp/include/spine/Skeleton.h +++ b/spine-cpp/spine-cpp/include/spine/Skeleton.h @@ -36,6 +36,7 @@ #include #include #include +#include namespace spine { class SkeletonData; @@ -251,19 +252,19 @@ namespace spine { void update(float delta); float getWindX(); - + void setWindX(float windX); - + float getWindY(); - + void setWindY(float windY); - + float getGravityX(); - + void setGravityX(float gravityX); - + float getGravityY(); - + void setGravityY(float gravityY); /// Rotates the physics constraint so next {@link #update(Physics)} forces are applied as if the bone rotated around the diff --git a/spine-cpp/spine-cpp/src/spine/Skin.cpp b/spine-cpp/spine-cpp/src/spine/Skin.cpp index 582b26abe..f69c2191f 100644 --- a/spine-cpp/spine-cpp/src/spine/Skin.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skin.cpp @@ -147,9 +147,9 @@ void Skin::attachAll(Skeleton &skeleton, Skin &oldSkin) { int slotIndex = (int) entry._slotIndex; Slot *slot = slots[slotIndex]; - if (slot->getAttachment() == entry._attachment) { + if (slot->getPose().getAttachment() == entry._attachment) { Attachment *attachment = getAttachment(slotIndex, entry._name); - if (attachment) slot->setAttachment(attachment); + if (attachment) slot->getPose().setAttachment(attachment); } } }