UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #431 from Fenrisul/master

Browse Source 
[Unity] Updated some editor usability things
This commit is contained in:
Fenrisul 2015-06-04 10:42:10 -07:00
commit 0cd14e1361
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs
View File

@ -360,6 +360,7 @@ public static class SkeletonBaker {
if (skeletonDataAsset.controller != null) { if (skeletonDataAsset.controller != null) {
controller = (UnityEditor.Animations.AnimatorController)skeletonDataAsset.controller; controller = (UnityEditor.Animations.AnimatorController)skeletonDataAsset.controller;
controllerPath = AssetDatabase.GetAssetPath(controller);
} else { } else {
if (File.Exists(controllerPath)) { if (File.Exists(controllerPath)) {
if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) { 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) { if (skeletonDataAsset.controller != null) {
controller = (UnityEditorInternal.AnimatorController)skeletonDataAsset.controller; controller = (UnityEditorInternal.AnimatorController)skeletonDataAsset.controller;
controllerPath = AssetDatabase.GetAssetPath(controller);
} else { } else {
if (File.Exists(controllerPath)) { if (File.Exists(controllerPath)) {
if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) { if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {

20
spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
View File

@ -54,8 +54,8 @@ public class SpineSlotDrawer : PropertyDrawer {
} else if (property.serializedObject.targetObject is Component) { } else if (property.serializedObject.targetObject is Component) {
var component = (Component)property.serializedObject.targetObject; var component = (Component)property.serializedObject.targetObject;
if (component.GetComponent<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
var skeletonRenderer = component.GetComponent<SkeletonRenderer>(); var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }
@ -159,8 +159,8 @@ public class SpineSkinDrawer : PropertyDrawer {
} else if (property.serializedObject.targetObject is Component) { } else if (property.serializedObject.targetObject is Component) {
var component = (Component)property.serializedObject.targetObject; var component = (Component)property.serializedObject.targetObject;
if (component.GetComponent<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
var skeletonRenderer = component.GetComponent<SkeletonRenderer>(); var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }
@ -303,8 +303,8 @@ public class SpineAnimationDrawer : PropertyDrawer {
} }
} else if (property.serializedObject.targetObject is Component) { } else if (property.serializedObject.targetObject is Component) {
var component = (Component)property.serializedObject.targetObject; var component = (Component)property.serializedObject.targetObject;
if (component.GetComponent<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
var skeletonRenderer = component.GetComponent<SkeletonRenderer>(); var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }
@ -383,8 +383,8 @@ public class SpineAttachmentDrawer : PropertyDrawer {
} else if (property.serializedObject.targetObject is Component) { } else if (property.serializedObject.targetObject is Component) {
var component = (Component)property.serializedObject.targetObject; var component = (Component)property.serializedObject.targetObject;
if (component.GetComponent<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
skeletonRenderer = component.GetComponent<SkeletonRenderer>(); skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }
@ -533,8 +533,8 @@ public class SpineBoneDrawer : PropertyDrawer {
} else if (property.serializedObject.targetObject is Component) { } else if (property.serializedObject.targetObject is Component) {
var component = (Component)property.serializedObject.targetObject; var component = (Component)property.serializedObject.targetObject;
if (component.GetComponent<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
var skeletonRenderer = component.GetComponent<SkeletonRenderer>(); var skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }