Merge branch 'dev5' into 5.0

Author: coderespawn

CHANGELOG.md

@@ -1,5 +1,9 @@
 CHANGELOG: Prefabricator
 ========================
+Version 1.8.1
+-------------
+* CRITICAL FIX: Fixed a crash issue while creating a Prefab from the menu [@LucenDev] 
+
 Version 1.8.0
 -------------
 * New: Support for Unreal Engine 5.0

Prefabricator.uplugin

@@ -1,8 +1,8 @@
 {
 	"FileVersion" : 3,
 	"FriendlyName" : "Prefabricator",
-	"Version" : 24,
-	"VersionName" : "1.7.0-ea2",
+	"Version" : 25,
+	"VersionName" : "1.8.1",
 	"CreatedBy" : "Code Respawn",
 	"CreatedByURL" : "http://prefabricator.dev",
 	"DocsURL": "http://docs.prefabricator.dev",

Source/PrefabricatorEditor/PrefabricatorEditor.Build.cs

@@ -55,6 +55,7 @@ public PrefabricatorEditor(ReadOnlyTargetRules Target) : base(Target)
                     "LevelEditor",
 				    "EditorStyle",
 				    "ContentBrowser",
+				    "ContentBrowserData",
                     "Projects",
                     "PrefabricatorRuntime",
 					// ... add private dependencies that you statically link with here ...

Source/PrefabricatorEditor/Private/Utils/PrefabEditorTools.cpp

@@ -19,6 +19,7 @@
 #include "EngineModule.h"
 #include "EngineUtils.h"
 #include "Framework/Notifications/NotificationManager.h"
+#include "IContentBrowserDataModule.h"
 #include "IContentBrowserSingleton.h"
 #include "Kismet/KismetRenderingLibrary.h"
 #include "LegacyScreenPercentageDriver.h"
@@ -33,8 +34,14 @@ namespace {
 		IContentBrowserSingleton& ContentBrowserSingleton = FModuleManager::LoadModuleChecked<FContentBrowserModule>("ContentBrowser").Get();
 		TArray<FString> SelectedFolders;
 		ContentBrowserSingleton.GetSelectedPathViewFolders(SelectedFolders);
-		FString AssetFolder = SelectedFolders.Num() > 0 ? SelectedFolders[0] : "/Game";
-		FString AssetPath = AssetFolder + "/" + InAssetName;
+		const FString VirtualAssetFolder = SelectedFolders.Num() > 0 ? SelectedFolders[0] : "/All/Game";
+		
+		FString AssetFolder;
+		const EContentBrowserPathType PathType = IContentBrowserDataModule::Get().GetSubsystem()->TryConvertVirtualPath(VirtualAssetFolder, AssetFolder);
+		if (PathType != EContentBrowserPathType::Internal) {
+			AssetFolder = "/Game";
+		}
+		const FString AssetPath = AssetFolder + "/" + InAssetName;
 
 		FString PackageName, AssetName;
 		IAssetTools& AssetTools = FModuleManager::Get().LoadModuleChecked<FAssetToolsModule>("AssetTools").Get();