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

Fix crash when importing model as prefab and handle duplicated object names

Browse Source 
#3558
This commit is contained in:
Wojtek Figat
2025-09-21 22:52:57 +02:00
parent a0f764a774
commit 5f1e905e8f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/ContentImporters/ImportModel.cpp
View File

@@ -26,6 +26,7 @@
#include "Engine/Utilities/RectPack.h" #include "Engine/Utilities/RectPack.h"
#include "Engine/Scripting/Scripting.h" #include "Engine/Scripting/Scripting.h"
#include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Profiler/ProfilerCPU.h"
#include "Editor/Utilities/EditorUtilities.h"
#include "AssetsImportingManager.h" #include "AssetsImportingManager.h"
bool ImportModel::TryGetImportOptions(const StringView& path, Options& options) bool ImportModel::TryGetImportOptions(const StringView& path, Options& options)
@@ -281,13 +282,19 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
// Import all of the objects recursive but use current model data to skip loading file again // Import all of the objects recursive but use current model data to skip loading file again
options.Cached = &cached; options.Cached = &cached;
Function<bool(Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData)> splitImport = [&context, &autoImportOutput](Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData) HashSet<String> objectNames;
Function<bool(Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData)> splitImport = [&context, &autoImportOutput, &objectNames](Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData)
{ {
// Recursive importing of the split object // Recursive importing of the split object
String postFix = objectName; String postFix = objectName;
const int32 splitPos = postFix.FindLast(TEXT('|')); const int32 splitPos = postFix.FindLast(TEXT('|'));
if (splitPos != -1) if (splitPos != -1 && splitPos + 1 < postFix.Length())
postFix = postFix.Substring(splitPos + 1); postFix = postFix.Substring(splitPos + 1);
EditorUtilities::ValidatePathChars(postFix); // Ensure name is valid path
int32 duplicate = 0;
String postFixPre = postFix;
while (!objectNames.Add(postFix)) // Ensure name is unique
postFix = String::Format(TEXT("{} {}"), postFixPre, duplicate++);
// TODO: check for name collisions with material/texture assets // TODO: check for name collisions with material/texture assets
outputPath = autoImportOutput / String(StringUtils::GetFileNameWithoutExtension(context.TargetAssetPath)) + TEXT(" ") + postFix + TEXT(".flax"); outputPath = autoImportOutput / String(StringUtils::GetFileNameWithoutExtension(context.TargetAssetPath)) + TEXT(" ") + postFix + TEXT(".flax");
splitOptions.SubAssetFolder = TEXT(" "); // Use the same folder as asset as they all are imported to the subdir for the prefab (see SubAssetFolder usage above) splitOptions.SubAssetFolder = TEXT(" "); // Use the same folder as asset as they all are imported to the subdir for the prefab (see SubAssetFolder usage above)