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 2014-03-09 12:15:23 +01:00
commit 951fe77c09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-as3/spine-as3/src/spine/Skeleton.as
View File

@ -35,10 +35,10 @@ public class Skeleton {
internal var _slots:Vector.<Slot>; internal var _slots:Vector.<Slot>;
internal var _drawOrder:Vector.<Slot>; internal var _drawOrder:Vector.<Slot>;
internal var _skin:Skin; internal var _skin:Skin;
public var r:int = 1; public var r:Number = 1;
public var g:int = 1; public var g:Number = 1;
public var b:int = 1; public var b:Number = 1;
public var a:int = 1; public var a:Number = 1;
public var time:Number; public var time:Number;
public var flipX:Boolean; public var flipX:Boolean;
public var flipY:Boolean; public var flipY:Boolean;

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

@ -45,7 +45,7 @@ namespace Spine {
public void AddAttachment (int slotIndex, String name, Attachment attachment) { public void AddAttachment (int slotIndex, String name, Attachment attachment) {
if (attachment == null) throw new ArgumentNullException("attachment cannot be null."); if (attachment == null) throw new ArgumentNullException("attachment cannot be null.");
attachments.Add(new KeyValuePair<int, String>(slotIndex, name), attachment); attachments[new KeyValuePair<int, String>(slotIndex, name)] = attachment;
} }
/// <returns>May be null.</returns> /// <returns>May be null.</returns>