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

[Unity] Warnings cleanup

Browse Source
This commit is contained in:
Fenrisul 2015-04-25 01:06:47 -07:00
parent 7788abbee2
commit 65ef51d6bc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs
View File

@ -123,7 +123,7 @@ public class AtlasAssetInspector : Editor {
GUILayout.BeginHorizontal(); GUILayout.BeginHorizontal();
{ {
EditorGUI.BeginDisabledGroup(true); EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.ObjectField(mat, typeof(Material), GUILayout.Width(250)); EditorGUILayout.ObjectField(mat, typeof(Material), false, GUILayout.Width(250));
EditorGUI.EndDisabledGroup(); EditorGUI.EndDisabledGroup();
} }
GUILayout.EndHorizontal(); GUILayout.EndHorizontal();
@ -137,7 +137,7 @@ public class AtlasAssetInspector : Editor {
//EditorGUILayout.ToggleLeft(baked[i] ? "" : regions[i].name, baked[i]); //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]); bool result = baked[i] ? EditorGUILayout.ToggleLeft("", baked[i], GUILayout.Width(24)) : EditorGUILayout.ToggleLeft(" " + regions[i].name, baked[i]);
if(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]) { if (result && !baked[i]) {
//bake //bake

14
spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
View File

@ -426,8 +426,9 @@ public class SpineEditorUtilities : AssetPostprocessor {
static bool CheckForValidAtlas (string atlasPath) { static bool CheckForValidAtlas (string atlasPath) {
return false; return false;
//////////////DEPRECATED - always check for new atlas data now
/*
string dir = Path.GetDirectoryName(atlasPath); string dir = Path.GetDirectoryName(atlasPath);
TextAsset textAsset = (TextAsset)AssetDatabase.LoadAssetAtPath(atlasPath, typeof(TextAsset)); TextAsset textAsset = (TextAsset)AssetDatabase.LoadAssetAtPath(atlasPath, typeof(TextAsset));
DirectoryInfo dirInfo = new DirectoryInfo(dir); DirectoryInfo dirInfo = new DirectoryInfo(dir);
@ -441,7 +442,7 @@ public class SpineEditorUtilities : AssetPostprocessor {
var atlasAsset = (AtlasAsset)obj; var atlasAsset = (AtlasAsset)obj;
if (atlasAsset.atlasFile == textAsset) { if (atlasAsset.atlasFile == textAsset) {
/*
Atlas atlas = atlasAsset.GetAtlas(); Atlas atlas = atlasAsset.GetAtlas();
FieldInfo field = typeof(Atlas).GetField("regions", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.NonPublic); FieldInfo field = typeof(Atlas).GetField("regions", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.NonPublic);
List<AtlasRegion> regions = (List<AtlasRegion>)field.GetValue(atlas); List<AtlasRegion> regions = (List<AtlasRegion>)field.GetValue(atlas);
@ -459,7 +460,7 @@ public class SpineEditorUtilities : AssetPostprocessor {
BakeRegion(atlasAsset, region); BakeRegion(atlasAsset, region);
} }
} }
*/
return true; return true;
} }
@ -468,9 +469,8 @@ public class SpineEditorUtilities : AssetPostprocessor {
} }
return false; return false;
*/
} }
static List<AtlasAsset> MultiAtlasDialog (List<string> requiredPaths, string initialDirectory, string header = "") { static List<AtlasAsset> MultiAtlasDialog (List<string> requiredPaths, string initialDirectory, string header = "") {