From 5766aa747d414ba5facfee767486bb46d7117f73 Mon Sep 17 00:00:00 2001 From: pharan Date: Fri, 20 Apr 2018 12:05:32 +0800 Subject: [PATCH] [unity] Minor updates to editors. --- .../Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs | 6 ++++++ .../Assets/spine-unity/Editor/SpineAttributeDrawers.cs | 1 + .../Assets/spine-unity/Editor/SpineEditorUtilities.cs | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs index 34892081b..4219b27ab 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs @@ -238,6 +238,12 @@ namespace Spine.Unity.Editor { AssetDatabase.CreateAsset(newAsset, assetPath); } } + + var folderObject = AssetDatabase.LoadAssetAtPath(dataPath, typeof(UnityEngine.Object)); + if (folderObject != null) { + Selection.activeObject = folderObject; + EditorGUIUtility.PingObject(folderObject); + } } void OnInspectorGUIMulti () { diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs index 846113088..3eafcd243 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs @@ -75,6 +75,7 @@ namespace Spine.Unity.Editor { } SerializedProperty dataField = property.FindBaseOrSiblingProperty(TargetAttribute.dataField); + if (dataField != null) { var objectReferenceValue = dataField.objectReferenceValue; if (objectReferenceValue is SkeletonDataAsset) { diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs index d524129de..04fe68b8d 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs @@ -288,7 +288,6 @@ namespace Spine.Unity.Editor { defaultShader = shader != null ? shader.name : DEFAULT_DEFAULT_SHADER; if (EditorGUI.EndChangeCheck()) EditorPrefs.SetString(DEFAULT_SHADER_KEY, defaultShader); - EditorGUILayout.Space(); EditorGUI.BeginChangeCheck(); setTextureImporterSettings = EditorGUILayout.Toggle(new GUIContent("Apply Atlas Texture Settings", "Apply the recommended settings for Texture Importers."), showHierarchyIcons); @@ -296,6 +295,8 @@ namespace Spine.Unity.Editor { EditorPrefs.SetBool(SET_TEXTUREIMPORTER_SETTINGS_KEY, showHierarchyIcons); } + EditorGUILayout.Space(); + EditorGUILayout.LabelField("Editor Instantiation", EditorStyles.boldLabel); EditorGUI.BeginChangeCheck(); defaultZSpacing = EditorGUILayout.Slider("Default Slot Z-Spacing", defaultZSpacing, -0.1f, 0f);