From 62268f5bfabf2f579ef1e7c444d29c5eaad24d18 Mon Sep 17 00:00:00 2001
From: Fenrisul <mitch@xdtech.net>
Date: Thu, 4 Jun 2015 10:41:27 -0700
Subject: [PATCH] [Unity] Updated some editor usability things

---
 .../spine-unity/Editor/SkeletonBaker.cs       |  2 ++
 .../Editor/SpineAttributeDrawers.cs           | 20 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs
index 2817cfa20..683cbf327 100644
--- a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs
+++ b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs
@@ -360,6 +360,7 @@ public static class SkeletonBaker {
 
 		if (skeletonDataAsset.controller != null) {
 			controller = (UnityEditor.Animations.AnimatorController)skeletonDataAsset.controller;
+			controllerPath = AssetDatabase.GetAssetPath(controller);
 		} else {
 			if (File.Exists(controllerPath)) {
 				if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {
@@ -377,6 +378,7 @@ public static class SkeletonBaker {
 
 		if (skeletonDataAsset.controller != null) {
 			controller = (UnityEditorInternal.AnimatorController)skeletonDataAsset.controller;
+			controllerPath = AssetDatabase.GetAssetPath(controller);
 		} else {
 			if (File.Exists(controllerPath)) {
 				if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {
diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
index 757f8c21c..fbf51dcf8 100644
--- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
+++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
@@ -54,8 +54,8 @@ public class SpineSlotDrawer : PropertyDrawer {
 
 		} else if (property.serializedObject.targetObject is Component) {
 			var component = (Component)property.serializedObject.targetObject;
-			if (component.GetComponent<SkeletonRenderer>() != null) {
-				var skeletonRenderer = component.GetComponent<SkeletonRenderer>();
+			if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
+				var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
 				skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
 			}
 		}
@@ -159,8 +159,8 @@ public class SpineSkinDrawer : PropertyDrawer {
 
 		} else if (property.serializedObject.targetObject is Component) {
 			var component = (Component)property.serializedObject.targetObject;
-			if (component.GetComponent<SkeletonRenderer>() != null) {
-				var skeletonRenderer = component.GetComponent<SkeletonRenderer>();
+			if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
+				var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
 				skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
 			}
 		}
@@ -303,8 +303,8 @@ public class SpineAnimationDrawer : PropertyDrawer {
 			}
 		} else if (property.serializedObject.targetObject is Component) {
 			var component = (Component)property.serializedObject.targetObject;
-			if (component.GetComponent<SkeletonRenderer>() != null) {
-				var skeletonRenderer = component.GetComponent<SkeletonRenderer>();
+			if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
+				var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
 				skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
 			}
 		}
@@ -383,8 +383,8 @@ public class SpineAttachmentDrawer : PropertyDrawer {
 
 		} else if (property.serializedObject.targetObject is Component) {
 			var component = (Component)property.serializedObject.targetObject;
-			if (component.GetComponent<SkeletonRenderer>() != null) {
-				skeletonRenderer = component.GetComponent<SkeletonRenderer>();
+			if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
+				skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
 				skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
 			}
 		}
@@ -533,8 +533,8 @@ public class SpineBoneDrawer : PropertyDrawer {
 
 		} else if (property.serializedObject.targetObject is Component) {
 			var component = (Component)property.serializedObject.targetObject;
-			if (component.GetComponent<SkeletonRenderer>() != null) {
-				var skeletonRenderer = component.GetComponent<SkeletonRenderer>();
+			if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
+				var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
 				skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
 			}
 		}