From 861aa8d5c81b9e37dcdaa7234b50e30ecd156d89 Mon Sep 17 00:00:00 2001 From: pharan Date: Wed, 25 Apr 2018 09:55:12 +0800 Subject: [PATCH] [unity] Handle extra case for attributes without dataField. --- .../spine-unity/Editor/SpineAttributeDrawers.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs index 3eafcd243..20b6ff602 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs @@ -89,9 +89,16 @@ namespace Spine.Unity.Editor { return; } - } else if (property.serializedObject.targetObject is Component) { - var component = (Component)property.serializedObject.targetObject; - var hasSkeletonDataAsset = component.GetComponentInChildren(typeof(IHasSkeletonDataAsset)) as IHasSkeletonDataAsset; + } else { + var targetObject = property.serializedObject.targetObject; + + IHasSkeletonDataAsset hasSkeletonDataAsset = targetObject as IHasSkeletonDataAsset; + if (hasSkeletonDataAsset == null) { + var component = targetObject as Component; + if (component != null) + hasSkeletonDataAsset = component.GetComponentInChildren(typeof(IHasSkeletonDataAsset)) as IHasSkeletonDataAsset; + } + if (hasSkeletonDataAsset != null) skeletonDataAsset = hasSkeletonDataAsset.SkeletonDataAsset; }