From ea4224ba67c908e5df55ca746a91986debc3961e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 10 Apr 2022 15:24:02 +0200
Subject: [PATCH] Fix drag&drop into Scene Tree if move goes over valid drop
 target first

---
 Source/Editor/Windows/SceneTreeWindow.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Windows/SceneTreeWindow.cs b/Source/Editor/Windows/SceneTreeWindow.cs
index 652cc2b6e..517f50252 100644
--- a/Source/Editor/Windows/SceneTreeWindow.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.cs
@@ -326,7 +326,7 @@ namespace FlaxEditor.Windows
 
             _isUpdatingSelection = false;
         }
-        
+
         private bool ValidateDragAsset(AssetItem assetItem)
         {
             return assetItem.OnEditorDrag(this);
@@ -417,7 +417,7 @@ namespace FlaxEditor.Windows
         public override DragDropEffect OnDragEnter(ref Vector2 location, DragData data)
         {
             var result = base.OnDragEnter(ref location, data);
-            if (result == DragDropEffect.None && Editor.StateMachine.CurrentState.CanEditScene)
+            if (Editor.StateMachine.CurrentState.CanEditScene)
             {
                 if (_dragHandlers == null)
                     _dragHandlers = new DragHandlers();
@@ -426,14 +426,14 @@ namespace FlaxEditor.Windows
                     _dragAssets = new DragAssets(ValidateDragAsset);
                     _dragHandlers.Add(_dragAssets);
                 }
-                if (_dragAssets.OnDragEnter(data))
+                if (_dragAssets.OnDragEnter(data) && result == DragDropEffect.None)
                     return _dragAssets.Effect;
                 if (_dragActorType == null)
                 {
                     _dragActorType = new DragActorType(ValidateDragActorType);
                     _dragHandlers.Add(_dragActorType);
                 }
-                if (_dragActorType.OnDragEnter(data))
+                if (_dragActorType.OnDragEnter(data) && result == DragDropEffect.None)
                     return _dragActorType.Effect;
             }
             return result;