From 1fa2b35e096c40809de8bf16193e3a0f8c013806 Mon Sep 17 00:00:00 2001
From: NathanSweet <nathan.sweet@gmail.com>
Date: Sat, 28 May 2016 01:33:45 +0200
Subject: [PATCH] Clean up.

---
 .../com/esotericsoftware/spine/BoneData.java   | 18 +++++++++---------
 .../esotericsoftware/spine/SkeletonJson.java   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
index b1b6026a1..ac8151445 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
@@ -39,7 +39,7 @@ public class BoneData {
 	final BoneData parent;
 	float length;
 	float x, y, rotation, scaleX = 1, scaleY = 1, shearX, shearY;
-	boolean inheritScale = true, inheritRotation = true;
+	boolean inheritRotation = true, inheritScale = true;
 
 	// Nonessential.
 	final Color color = new Color(0.61f, 0.61f, 0.61f, 1);
@@ -156,14 +156,6 @@ public class BoneData {
 		this.shearY = shearY;
 	}
 
-	public boolean getInheritScale () {
-		return inheritScale;
-	}
-
-	public void setInheritScale (boolean inheritScale) {
-		this.inheritScale = inheritScale;
-	}
-
 	public boolean getInheritRotation () {
 		return inheritRotation;
 	}
@@ -172,6 +164,14 @@ public class BoneData {
 		this.inheritRotation = inheritRotation;
 	}
 
+	public boolean getInheritScale () {
+		return inheritScale;
+	}
+
+	public void setInheritScale (boolean inheritScale) {
+		this.inheritScale = inheritScale;
+	}
+
 	public Color getColor () {
 		return color;
 	}
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
index e018b10d2..72afbc720 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
@@ -123,8 +123,8 @@ public class SkeletonJson {
 			data.scaleY = boneMap.getFloat("scaleY", 1);
 			data.shearX = boneMap.getFloat("shearX", 0);
 			data.shearY = boneMap.getFloat("shearY", 0);
-			data.inheritScale = boneMap.getBoolean("inheritScale", true);
 			data.inheritRotation = boneMap.getBoolean("inheritRotation", true);
+			data.inheritScale = boneMap.getBoolean("inheritScale", true);
 
 			String color = boneMap.getString("color", null);
 			if (color != null) data.getColor().set(Color.valueOf(color));