UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 02:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2013-08-01 17:13:16 +02:00
commit c4feeeb310
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-csharp/src/SkeletonData.cs
View File

@ -129,7 +129,7 @@ namespace Spine {
// ---
override public String ToString () {
return Name != null ? Name : base.ToString();
return Name ?? base.ToString();
}
}
}

8
spine-js/spine.js
View File

@ -742,7 +742,7 @@ spine.RegionAttachment.prototype = {
vertices[6/*X4*/] = offset[6/*X4*/] * m00 + offset[7/*Y4*/] * m01 + x;
vertices[7/*Y4*/] = offset[6/*X4*/] * m10 + offset[7/*Y4*/] * m11 + y;
}
}
};
spine.AnimationStateData = function (skeletonData) {
this.skeletonData = skeletonData;
@ -1291,11 +1291,11 @@ spine.AtlasReader.prototype = {
tuple[i] = this.trim(line.substring(lastMatch));
return i + 1;
}
}
};
spine.AtlasAttachmentLoader = function (atlas) {
this.atlas = atlas;
}
};
spine.AtlasAttachmentLoader.prototype = {
newAttachment: function (skin, type, name) {
switch (type) {
@ -1315,4 +1315,4 @@ spine.AtlasAttachmentLoader.prototype = {
}
throw "Unknown attachment type: " + type;
}
}
};