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

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-14 18:14:59 +02:00
parent 19f14919c0 0b1c23dde3
commit 0e2d1b6ad2
18 changed files with 516 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Windows/Assets/PrefabWindow.Actions.cs
View File

@@ -144,7 +144,7 @@ namespace FlaxEditor.Windows.Assets
// Set paste target if only one actor is selected and no target provided
if (pasteTargetActor == null && Selection.Count == 1 && Selection[0] is ActorNode actorNode)
{
pasteTargetActor = actorNode.Actor;
pasteTargetActor = actorNode.Actor.IsPrefabRoot ? actorNode.Actor : actorNode.Actor.Parent;
}
// Create paste action