From 6609425880a25506d8c597d2ecdf23898b3d4879 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 8 Aug 2021 17:25:18 +0200
Subject: [PATCH] Fix creating prefab in Editor from selection in Prefab window

---
 Source/Editor/Modules/PrefabsModule.cs          | 17 +++++++++++++++--
 .../Windows/Assets/PrefabWindow.Hierarchy.cs    |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Modules/PrefabsModule.cs b/Source/Editor/Modules/PrefabsModule.cs
index b33da20df..eab8d9e79 100644
--- a/Source/Editor/Modules/PrefabsModule.cs
+++ b/Source/Editor/Modules/PrefabsModule.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using FlaxEditor.Actions;
 using FlaxEditor.Content;
@@ -49,8 +50,20 @@ namespace FlaxEditor.Modules
         /// </remarks>
         public void CreatePrefab()
         {
-            // Check selection
-            var selection = Editor.SceneEditing.Selection;
+            CreatePrefab(Editor.SceneEditing.Selection);
+        }
+
+        /// <summary>
+        /// Starts the creating prefab for the selected actor by showing the new item creation dialog in <see cref="ContentWindow"/>.
+        /// </summary>
+        /// <remarks>
+        /// To create prefab manually (from code) use <see cref="PrefabManager.CreatePrefab"/> method.
+        /// </remarks>
+        /// <param name="selection">The scene selection to use.</param>
+        public void CreatePrefab(List<SceneGraphNode> selection)
+        {
+            if (selection == null)
+                selection = Editor.SceneEditing.Selection;
             if (selection.Count == 1 && selection[0] is ActorNode actorNode && actorNode.CanCreatePrefab)
             {
                 CreatePrefab(actorNode.Actor);
diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
index b5276edea..51e907c27 100644
--- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
+++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
@@ -109,7 +109,7 @@ namespace FlaxEditor.Windows.Assets
 
             contextMenu.AddSeparator();
 
-            b = contextMenu.AddButton("Create Prefab", Editor.Prefabs.CreatePrefab);
+            b = contextMenu.AddButton("Create Prefab", () => Editor.Prefabs.CreatePrefab(Selection));
             b.Enabled = isSingleActorSelected &&
                         (Selection[0] as ActorNode).CanCreatePrefab &&
                         Editor.Windows.ContentWin.CurrentViewFolder.CanHaveAssets;