From f0d1b757322a1960f0a62ea88b8315462c7164ec Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 4 Jan 2016 09:39:38 +0800 Subject: [PATCH] [Unity] Disabled a false error message. --- .../spine-unity/Editor/SpineAttributeDrawers.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs index da4123d92..7cdc9080e 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs @@ -178,14 +178,11 @@ public class SpineAttachmentDrawer : SpineTreeItemDrawerBase { List validSkins = new List(); SkeletonRenderer skeletonRenderer = null; - if (property.serializedObject.targetObject is Component) { - var component = (Component)property.serializedObject.targetObject; + var component = property.serializedObject.targetObject as Component; + if (component != null) { if (component.GetComponentInChildren() != null) { skeletonRenderer = component.GetComponentInChildren(); - if (skeletonDataAsset != skeletonRenderer.skeletonDataAsset) { - Debug.LogError("DataField SkeletonDataAsset and SkeletonRenderer/SkeletonAnimation's SkeletonDataAsset do not match. Remove the explicit dataField parameter of your [SpineAttachment] field."); - } - + //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."); skeletonDataAsset = skeletonRenderer.skeletonDataAsset; } } @@ -212,9 +209,11 @@ public class SpineAttachmentDrawer : SpineTreeItemDrawerBase { menu.AddDisabledItem(new GUIContent(skeletonRenderer.gameObject.name + " (SkeletonRenderer)")); else menu.AddDisabledItem(new GUIContent(skeletonDataAsset.name)); + menu.AddSeparator(""); menu.AddItem(new GUIContent("Null"), property.stringValue == "", HandleSelect, new SpineDrawerValuePair("", property)); + menu.AddSeparator(""); Skin defaultSkin = data.Skins.Items[0];