From 65ef51d6bcf42e4b22dfafe446f3d05d7b93805c Mon Sep 17 00:00:00 2001 From: Fenrisul Date: Sat, 25 Apr 2015 01:06:47 -0700 Subject: [PATCH] [Unity] Warnings cleanup --- .../spine-unity/Editor/AtlasAssetInspector.cs | 4 ++-- .../spine-unity/Editor/SpineEditorUtilities.cs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs b/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs index 302824d8b..93bab1a35 100644 --- a/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs +++ b/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs @@ -123,7 +123,7 @@ public class AtlasAssetInspector : Editor { GUILayout.BeginHorizontal(); { EditorGUI.BeginDisabledGroup(true); - EditorGUILayout.ObjectField(mat, typeof(Material), GUILayout.Width(250)); + EditorGUILayout.ObjectField(mat, typeof(Material), false, GUILayout.Width(250)); EditorGUI.EndDisabledGroup(); } GUILayout.EndHorizontal(); @@ -137,7 +137,7 @@ public class AtlasAssetInspector : Editor { //EditorGUILayout.ToggleLeft(baked[i] ? "" : regions[i].name, baked[i]); bool result = baked[i] ? EditorGUILayout.ToggleLeft("", baked[i], GUILayout.Width(24)) : EditorGUILayout.ToggleLeft(" " + regions[i].name, baked[i]); if(baked[i]){ - EditorGUILayout.ObjectField(bakedObjects[i], typeof(GameObject), GUILayout.Width(250)); + EditorGUILayout.ObjectField(bakedObjects[i], typeof(GameObject), false, GUILayout.Width(250)); } if (result && !baked[i]) { //bake diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs index 0563db5cc..733c83093 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs @@ -426,8 +426,9 @@ public class SpineEditorUtilities : AssetPostprocessor { static bool CheckForValidAtlas (string atlasPath) { - return false; - + return false; + //////////////DEPRECATED - always check for new atlas data now + /* string dir = Path.GetDirectoryName(atlasPath); TextAsset textAsset = (TextAsset)AssetDatabase.LoadAssetAtPath(atlasPath, typeof(TextAsset)); DirectoryInfo dirInfo = new DirectoryInfo(dir); @@ -441,7 +442,7 @@ public class SpineEditorUtilities : AssetPostprocessor { var atlasAsset = (AtlasAsset)obj; if (atlasAsset.atlasFile == textAsset) { - /* + Atlas atlas = atlasAsset.GetAtlas(); FieldInfo field = typeof(Atlas).GetField("regions", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.NonPublic); List regions = (List)field.GetValue(atlas); @@ -459,7 +460,7 @@ public class SpineEditorUtilities : AssetPostprocessor { BakeRegion(atlasAsset, region); } } - */ + return true; } @@ -468,9 +469,8 @@ public class SpineEditorUtilities : AssetPostprocessor { } return false; - - - + + */ } static List MultiAtlasDialog (List requiredPaths, string initialDirectory, string header = "") {