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

Initial import error fix

Browse Source
This commit is contained in:
Fenrisul 2015-01-23 00:21:27 -08:00
parent f7d8b9d3f9
commit 9911183a3d
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ public class AtlasAssetInspector : Editor {
private SerializedProperty atlasFile, materials; private SerializedProperty atlasFile, materials;
void OnEnable () { void OnEnable () {
SpineEditorUtilities.ConfirmInitialization();
atlasFile = serializedObject.FindProperty("atlasFile"); atlasFile = serializedObject.FindProperty("atlasFile");
materials = serializedObject.FindProperty("materials"); materials = serializedObject.FindProperty("materials");
} }

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

@ -60,6 +60,8 @@ public class SkeletonDataAssetInspector : Editor {
void OnEnable() { void OnEnable() {
SpineEditorUtilities.ConfirmInitialization();
try { try {
atlasAssets = serializedObject.FindProperty("atlasAssets"); atlasAssets = serializedObject.FindProperty("atlasAssets");
skeletonJSON = serializedObject.FindProperty("skeletonJSON"); skeletonJSON = serializedObject.FindProperty("skeletonJSON");

1
spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs
View File

@ -36,6 +36,7 @@ public class SkeletonRendererInspector : Editor {
protected SerializedProperty skeletonDataAsset, initialSkinName, normals, tangents, meshes, immutableTriangles, submeshSeparators; protected SerializedProperty skeletonDataAsset, initialSkinName, normals, tangents, meshes, immutableTriangles, submeshSeparators;
protected virtual void OnEnable () { protected virtual void OnEnable () {
SpineEditorUtilities.ConfirmInitialization();
skeletonDataAsset = serializedObject.FindProperty("skeletonDataAsset"); skeletonDataAsset = serializedObject.FindProperty("skeletonDataAsset");
initialSkinName = serializedObject.FindProperty("initialSkinName"); initialSkinName = serializedObject.FindProperty("initialSkinName");
normals = serializedObject.FindProperty("calculateNormals"); normals = serializedObject.FindProperty("calculateNormals");

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

@ -146,8 +146,13 @@ public class SpineEditorUtilities : AssetPostprocessor {
public static float defaultScale = 0.01f; public static float defaultScale = 0.01f;
public static float defaultMix = 0.2f; public static float defaultMix = 0.2f;
public static string defaultShader = "Spine/Skeleton"; public static string defaultShader = "Spine/Skeleton";
public static bool initialized;
static SpineEditorUtilities() { static SpineEditorUtilities() {
Initialize();
}
static void Initialize(){
DirectoryInfo rootDir = new DirectoryInfo(Application.dataPath); DirectoryInfo rootDir = new DirectoryInfo(Application.dataPath);
FileInfo[] files = rootDir.GetFiles("SpineEditorUtilities.cs", SearchOption.AllDirectories); FileInfo[] files = rootDir.GetFiles("SpineEditorUtilities.cs", SearchOption.AllDirectories);
editorPath = Path.GetDirectoryName(files[0].FullName.Replace("\\", "/").Replace(Application.dataPath, "Assets")); editorPath = Path.GetDirectoryName(files[0].FullName.Replace("\\", "/").Replace(Application.dataPath, "Assets"));
@ -162,6 +167,12 @@ public class SpineEditorUtilities : AssetPostprocessor {
EditorApplication.hierarchyWindowItemOnGUI += HierarchyWindowItemOnGUI; EditorApplication.hierarchyWindowItemOnGUI += HierarchyWindowItemOnGUI;
HierarchyWindowChanged(); HierarchyWindowChanged();
initialized = true;
}
public static void ConfirmInitialization(){
if(!initialized || Icons.skeleton == null)
Initialize();
} }
static void HierarchyWindowChanged() { static void HierarchyWindowChanged() {