Skip to content

Commit

Permalink
Clean up.
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanSweet committed Nov 14, 2014
1 parent fbd9a20 commit 9dcaeb6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions spine-as3/spine-as3/src/spine/SkeletonJson.as
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ public class SkeletonJson {
boneData.rotation = (boneMap["rotation"] || 0);
boneData.scaleX = boneMap.hasOwnProperty("scaleX") ? boneMap["scaleX"] : 1;
boneData.scaleY = boneMap.hasOwnProperty("scaleY") ? boneMap["scaleY"] : 1;
boneData.flipX = boneMap.hasOwnProperty("flipX") ? boneMap["flipX"] : false;
boneData.flipY = boneMap.hasOwnProperty("flipY") ? boneMap["flipY"] : false;
boneData.flipX = boneMap["flipX"] || false;
boneData.flipY = boneMap["flipY"] || false;
boneData.inheritScale = boneMap.hasOwnProperty("inheritScale") ? boneMap["inheritScale"] : true;
boneData.inheritRotation = boneMap.hasOwnProperty("inheritRotation") ? boneMap["inheritRotation"] : true;
skeletonData.bones[skeletonData.bones.length] = boneData;
Expand Down Expand Up @@ -394,7 +394,7 @@ public class SkeletonJson {
var field:String = flipX ? "x" : "y";
frameIndex = 0;
for each (valueMap in values) {
flipTimeline.setFrame(frameIndex, valueMap["time"], valueMap.hasOwnProperty(field) ? valueMap[field] : false);
flipTimeline.setFrame(frameIndex, valueMap["time"], valueMap[field] || false);
frameIndex++;
}
timelines[timelines.length] = flipTimeline;
Expand Down

0 comments on commit 9dcaeb6

Please sign in to comment.