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

Fixed ambiguous method return in Unity 5 release.

Browse Source
This commit is contained in:
pharan 2015-03-04 10:13:53 +08:00
parent 2de88fc6aa
commit b28b7674d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,9 @@ public class SkeletonRendererInspector : Editor {
front = serializedObject.FindProperty("frontFacing"); front = serializedObject.FindProperty("frontFacing");
if(EditorGUILayoutSortingLayerField == null) if(EditorGUILayoutSortingLayerField == null)
EditorGUILayoutSortingLayerField = typeof(EditorGUILayout).GetMethod("SortingLayerField", BindingFlags.Static | BindingFlags.NonPublic); EditorGUILayoutSortingLayerField = typeof(EditorGUILayout).GetMethod("SortingLayerField", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[] { typeof(GUIContent), typeof(SerializedProperty), typeof(GUIStyle) }, null);
rendererSerializedObject = new SerializedObject(((SkeletonRenderer)target).renderer); rendererSerializedObject = new SerializedObject(((SkeletonRenderer)target).GetComponent<Renderer>());
sortingLayerIDProperty = rendererSerializedObject.FindProperty("m_SortingLayerID"); sortingLayerIDProperty = rendererSerializedObject.FindProperty("m_SortingLayerID");
} }
@ -108,7 +108,7 @@ public class SkeletonRendererInspector : Editor {
if(renderer != null) { if(renderer != null) {
EditorGUI.BeginChangeCheck(); EditorGUI.BeginChangeCheck();
if(sortingLayerIDProperty != null) { if(EditorGUILayoutSortingLayerField != null && sortingLayerIDProperty != null) {
EditorGUILayoutSortingLayerField.Invoke(null, new object[] { new GUIContent("Sorting Layer"), sortingLayerIDProperty, EditorStyles.popup } ); EditorGUILayoutSortingLayerField.Invoke(null, new object[] { new GUIContent("Sorting Layer"), sortingLayerIDProperty, EditorStyles.popup } );
} else { } else {
renderer.sortingLayerID = EditorGUILayout.IntField("Sorting Layer ID", renderer.sortingLayerID); renderer.sortingLayerID = EditorGUILayout.IntField("Sorting Layer ID", renderer.sortingLayerID);