浏览代码

Fixed ambiguous method return in Unity 5 release.

pharan 10 年之前
父节点
当前提交
b28b7674d8
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs

+ 3 - 3
spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs

@@ -53,9 +53,9 @@ public class SkeletonRendererInspector : Editor {
 		front = serializedObject.FindProperty("frontFacing");
 
 		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");
 	}
 
@@ -108,7 +108,7 @@ public class SkeletonRendererInspector : Editor {
 			if(renderer != null) {
 				EditorGUI.BeginChangeCheck();
 
-				if(sortingLayerIDProperty != null) {
+				if(EditorGUILayoutSortingLayerField != null && sortingLayerIDProperty != null) {
 					EditorGUILayoutSortingLayerField.Invoke(null, new object[] { new GUIContent("Sorting Layer"), sortingLayerIDProperty, EditorStyles.popup } );
 				} else {
 					renderer.sortingLayerID = EditorGUILayout.IntField("Sorting Layer ID", renderer.sortingLayerID);