From 4048e6b7f58756181402d715889b906b9ea2c225 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 11 Dec 2017 00:37:12 +0800 Subject: [PATCH] [unity] Cleanup SkeletonDataAssetInspector --- .../Editor/SkeletonDataAssetInspector.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs index db5c18462..6f7aecf52 100644 --- a/spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs +++ b/spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs @@ -120,15 +120,6 @@ namespace Spine.Unity.Editor { } - void HandlePreviewSkinChanged (string skinName) { - EditorPrefs.SetString(LastSkinKey, skinName); - } - - void OnDestroy () { - EditorApplication.update -= EditorUpdate; - preview.OnDestroy(); - } - void EditorUpdate () { preview.AdjustCamera(); @@ -498,13 +489,6 @@ namespace Spine.Unity.Editor { EditorGUILayout.LabelField(SpineInspectorUtility.TempContent(line, Icons.warning)); } - void DoReimport () { - SpineEditorUtilities.ImportSpineContent(new [] { AssetDatabase.GetAssetPath(skeletonJSON.objectReferenceValue) }, true); - preview.Clear(); - InitializeEditor(); - EditorUtility.SetDirty(targetSkeletonDataAsset); - } - void PopulateWarnings () { warnings.Clear(); @@ -567,6 +551,22 @@ namespace Spine.Unity.Editor { } } + void DoReimport () { + SpineEditorUtilities.ImportSpineContent(new [] { AssetDatabase.GetAssetPath(skeletonJSON.objectReferenceValue) }, true); + preview.Clear(); + InitializeEditor(); + EditorUtility.SetDirty(targetSkeletonDataAsset); + } + + void HandlePreviewSkinChanged (string skinName) { + EditorPrefs.SetString(LastSkinKey, skinName); + } + + void OnDestroy () { + EditorApplication.update -= EditorUpdate; + preview.OnDestroy(); + } + #region Preview Handlers override public bool HasPreviewGUI () { if (serializedObject.isEditingMultipleObjects)