diff --git a/spine-as3/spine-as3/src/spine/Skeleton.as b/spine-as3/spine-as3/src/spine/Skeleton.as index eba5d3b69..fd17d693a 100644 --- a/spine-as3/spine-as3/src/spine/Skeleton.as +++ b/spine-as3/spine-as3/src/spine/Skeleton.as @@ -214,9 +214,9 @@ public class Skeleton { return _skin == null ? null : _skin._name; } - /** Sets the skin used to look up attachments not found in the {@link SkeletonData#getDefaultSkin() default skin}. Attachments - * from the new skin are attached if the corresponding attachment from the old skin was attached. If there was no old skin, - * each slot's setup mode attachment is attached from the new skin. + /** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. + * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was + * no old skin, each slot's setup mode attachment is attached from the new skin. * @param newSkin May be null. */ public function set skin (newSkin:Skin) : void { if (newSkin) { diff --git a/spine-c/include/spine/Skeleton.h b/spine-c/include/spine/Skeleton.h index 34517c8ff..e6428e27c 100644 --- a/spine-c/include/spine/Skeleton.h +++ b/spine-c/include/spine/Skeleton.h @@ -83,8 +83,9 @@ spSlot* spSkeleton_findSlot (const spSkeleton* self, const char* slotName); /* Returns -1 if the slot was not found. */ int spSkeleton_findSlotIndex (const spSkeleton* self, const char* slotName); -/* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are - * attached if the corresponding attachment from the old skin was attached. +/* Sets the skin used to look up attachments before looking in the SkeletonData defaultSkin. Attachments from the new skin are + * attached if the corresponding attachment from the old skin was attached. If there was no old skin, each slot's setup mode + * attachment is attached from the new skin. * @param skin May be 0.*/ void spSkeleton_setSkin (spSkeleton* self, spSkin* skin); /* Returns 0 if the skin was not found. See spSkeleton_setSkin. diff --git a/spine-csharp/src/Skeleton.cs b/spine-csharp/src/Skeleton.cs index 359b41afd..0e032dba5 100644 --- a/spine-csharp/src/Skeleton.cs +++ b/spine-csharp/src/Skeleton.cs @@ -230,9 +230,9 @@ namespace Spine { SetSkin(skin); } - /// Sets the skin used to look up attachments not found in the {@link SkeletonData#getDefaultSkin() default skin}. Attachments - /// from the new skin are attached if the corresponding attachment from the old skin was attached. If there was no old skin, each slot's - /// setup mode attachment is attached from the new skin. + /// Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default + /// skin}. Attachmentsfrom the new skin are attached if the corresponding attachment from the old skin was attached. If + /// there was no old skin, each slot's setup mode attachment is attached from the new skin. /// May be null. public void SetSkin (Skin newSkin) { if (newSkin != null) { diff --git a/spine-js/spine.js b/spine-js/spine.js index 79a971d53..d17c546a1 100644 --- a/spine-js/spine.js +++ b/spine-js/spine.js @@ -1139,9 +1139,9 @@ spine.Skeleton.prototype = { if (!skin) throw "Skin not found: " + skinName; this.setSkin(skin); }, - /** Sets the skin used to look up attachments not found in the {@link SkeletonData#getDefaultSkin() default skin}. Attachments - * from the new skin are attached if the corresponding attachment from the old skin was attached. If there was no old skin, - * each slot's setup mode attachment is attached from the new skin. + /** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. + * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was + * no old skin, each slot's setup mode attachment is attached from the new skin. * @param newSkin May be null. */ setSkin: function (newSkin) { if (newSkin) { diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java b/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java index 4309c3c36..c15b13bc8 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java @@ -282,9 +282,9 @@ public class Skeleton { setSkin(skin); } - /** Sets the skin used to look up attachments not found in the {@link SkeletonData#getDefaultSkin() default skin}. Attachments - * from the new skin are attached if the corresponding attachment from the old skin was attached. If there was no old skin, - * each slot's setup mode attachment is attached from the new skin. + /** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. + * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was no + * old skin, each slot's setup mode attachment is attached from the new skin. * @param newSkin May be null. */ public void setSkin (Skin newSkin) { if (newSkin != null) { diff --git a/spine-lua/Skeleton.lua b/spine-lua/Skeleton.lua index 25802854c..5c8ade791 100644 --- a/spine-lua/Skeleton.lua +++ b/spine-lua/Skeleton.lua @@ -151,6 +151,9 @@ function Skeleton.new (skeletonData) return self.slotsByName[slotName] end + -- Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. + -- Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was + -- no old skin, each slot's setup mode attachment is attached from the new skin. function self:setSkin (skinName) local newSkin if skinName then