GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drag-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-drag-fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-19 11:04:17 +02:00
parent 38b1203bb2 3792aa1984
commit 5eb888868f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
View File

@@ -611,22 +611,26 @@ namespace FlaxEditor.SceneGraph.GUI
script.SetParent(newParent, true);
}
}
Select();
result = DragDropEffect.Move;
}
// Drag assets
else if (_dragAssets != null && _dragAssets.HasValidDrag)
{
var spawnParent = myActor;
if (DragOverMode == DragItemPositioning.Above || DragOverMode == DragItemPositioning.Below)
spawnParent = newParent;
for (int i = 0; i < _dragAssets.Objects.Count; i++)
{
var item = _dragAssets.Objects[i];
var actor = item.OnEditorDrop(this);
actor.StaticFlags = Actor.StaticFlags;
actor.StaticFlags = spawnParent.StaticFlags;
actor.Name = item.ShortName;
actor.Transform = Actor.Transform;
ActorNode.Root.Spawn(actor, Actor);
actor.Transform = spawnParent.Transform;
Editor.Instance.SceneEditing.Spawn(actor, spawnParent, false);
actor.OrderInParent = newOrder;
}
result = DragDropEffect.Move;
}
// Drag actor type