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

Merge branch 'ensure-prefab-staticflags' of https://github.com/Tryibion/FlaxEngine into Tryibion-ensure-prefab-staticflags

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-07 10:46:20 +02:00
parent 4131e15f0e be204fd2f5
commit bcbbd98898
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,7 +625,16 @@ namespace FlaxEditor.SceneGraph.GUI
{ {
var item = _dragAssets.Objects[i]; var item = _dragAssets.Objects[i];
var actor = item.OnEditorDrop(this); var actor = item.OnEditorDrop(this);
actor.StaticFlags = spawnParent.StaticFlags; if (spawnParent.GetType() != typeof(Scene))
{
// Set all Actors static flags to match parents
List<Actor> childActors = new List<Actor>();
GetActorsTree(childActors, actor);
foreach (var child in childActors)
{
child.StaticFlags = spawnParent.StaticFlags;
}
}
actor.Name = item.ShortName; actor.Name = item.ShortName;
actor.Transform = spawnParent.Transform; actor.Transform = spawnParent.Transform;
Editor.Instance.SceneEditing.Spawn(actor, spawnParent, false); Editor.Instance.SceneEditing.Spawn(actor, spawnParent, false);
@@ -671,6 +680,16 @@ namespace FlaxEditor.SceneGraph.GUI
return result; return result;
} }
private void GetActorsTree(List<Actor> list, Actor a)
{
list.Add(a);
int cnt = a.ChildrenCount;
for (int i = 0; i < cnt; i++)
{
GetActorsTree(list, a.GetChild(i));
}
}
private bool ValidateDragActor(ActorNode actorNode) private bool ValidateDragActor(ActorNode actorNode)
{ {
// Reject dragging actors not linked to scene (eg. from prefab) or in the opposite way // Reject dragging actors not linked to scene (eg. from prefab) or in the opposite way