From a82b24a649a13ef688edaaae1ec5d43281971685 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 9 May 2022 11:50:17 +0200 Subject: [PATCH] [unity] Fixed drag and drop code affecting other non-Spine drag and drop events, introduced in commit 29e0e917. See #2077. --- .../spine-unity/Editor/Utility/SpineEditorUtilities.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs index ad82839a5..83195bfd6 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs @@ -446,10 +446,11 @@ namespace Spine.Unity.Editor { #if UNITY_2021_2_OR_NEWER internal static DragAndDropVisualMode HandleDragAndDrop (int dropTargetInstanceID, HierarchyDropFlags dropMode, Transform parentForDraggedObjects, bool perform) { - if (!perform || DragAndDrop.objectReferences.Length == 0) - return DragAndDropVisualMode.Copy; - SkeletonDataAsset skeletonDataAsset = DragAndDrop.objectReferences[0] as SkeletonDataAsset; + SkeletonDataAsset skeletonDataAsset = DragAndDrop.objectReferences.Length == 0 ? null : + DragAndDrop.objectReferences[0] as SkeletonDataAsset; if (skeletonDataAsset == null) + return DragAndDropVisualMode.None; + if (!perform) return DragAndDropVisualMode.Copy; GameObject dropTargetObject = UnityEditor.EditorUtility.InstanceIDToObject(dropTargetInstanceID) as GameObject;