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

[Unity] Disabled a false error message.

Browse Source
This commit is contained in:
pharan 2016-01-04 09:39:38 +08:00
parent ff5b7e67e4
commit f0d1b75732
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,14 +178,11 @@ public class SpineAttachmentDrawer : SpineTreeItemDrawerBase<SpineAttachment> {
List<Skin> validSkins = new List<Skin>(); List<Skin> validSkins = new List<Skin>();
SkeletonRenderer skeletonRenderer = null; SkeletonRenderer skeletonRenderer = null;
if (property.serializedObject.targetObject is Component) { var component = property.serializedObject.targetObject as Component;
var component = (Component)property.serializedObject.targetObject; if (component != null) {
if (component.GetComponentInChildren<SkeletonRenderer>() != null) { if (component.GetComponentInChildren<SkeletonRenderer>() != null) {
skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>(); skeletonRenderer = component.GetComponentInChildren<SkeletonRenderer>();
if (skeletonDataAsset != skeletonRenderer.skeletonDataAsset) { //if (skeletonDataAsset != skeletonRenderer.skeletonDataAsset) Debug.LogWarning("DataField SkeletonDataAsset and SkeletonRenderer/SkeletonAnimation's SkeletonDataAsset do not match. Remove the explicit dataField parameter of your [SpineAttachment] field.");
Debug.LogError("DataField SkeletonDataAsset and SkeletonRenderer/SkeletonAnimation's SkeletonDataAsset do not match. Remove the explicit dataField parameter of your [SpineAttachment] field.");
}
skeletonDataAsset = skeletonRenderer.skeletonDataAsset; skeletonDataAsset = skeletonRenderer.skeletonDataAsset;
} }
} }
@ -212,9 +209,11 @@ public class SpineAttachmentDrawer : SpineTreeItemDrawerBase<SpineAttachment> {
menu.AddDisabledItem(new GUIContent(skeletonRenderer.gameObject.name + " (SkeletonRenderer)")); menu.AddDisabledItem(new GUIContent(skeletonRenderer.gameObject.name + " (SkeletonRenderer)"));
else else
menu.AddDisabledItem(new GUIContent(skeletonDataAsset.name)); menu.AddDisabledItem(new GUIContent(skeletonDataAsset.name));
menu.AddSeparator(""); menu.AddSeparator("");
menu.AddItem(new GUIContent("Null"), property.stringValue == "", HandleSelect, new SpineDrawerValuePair("", property)); menu.AddItem(new GUIContent("Null"), property.stringValue == "", HandleSelect, new SpineDrawerValuePair("", property));
menu.AddSeparator(""); menu.AddSeparator("");
Skin defaultSkin = data.Skins.Items[0]; Skin defaultSkin = data.Skins.Items[0];