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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
This commit is contained in:
Wojtek Figat
2023-04-22 18:59:41 +02:00
parent 644eb35b97 73ff053470
commit 390460907d
51 changed files with 1397 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -612,22 +612,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