From 326e4f8b0106776342b03037028ba9bd21f21807 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 12 Aug 2021 17:28:15 +0200 Subject: [PATCH] [unity] Fixed a null reference exception in AnimationReferenceAsset inspector code when SkeletonData at the asset is null (e.g. when no json file is assigned). --- .../Editor/Asset Types/AnimationReferenceAssetEditor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs index 3c4c149f0..fdbdb582c 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs @@ -97,9 +97,6 @@ namespace Spine.Unity.Editor { preview.PlayPauseAnimation(animationNameProperty.stringValue, true); } - lastSkeletonDataAsset = ThisSkeletonDataAsset; - lastSkeletonData = ThisSkeletonDataAsset.GetSkeletonData(true); - //EditorGUILayout.HelpBox(AnimationReferenceAssetEditor.InspectorHelpText, MessageType.Info, true); EditorGUILayout.Space(); EditorGUI.BeginChangeCheck(); @@ -128,6 +125,9 @@ namespace Spine.Unity.Editor { } } } + + lastSkeletonDataAsset = ThisSkeletonDataAsset; + lastSkeletonData = ThisSkeletonDataAsset.GetSkeletonData(true); } #region Preview Handlers