From c96f80e75cb14c06c27cfd73511b58c0c003da85 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Sat, 11 Jul 2026 15:50:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95mujoco?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=AF=BC=E5=85=A5=E6=97=B6=E6=84=8F=E5=A4=96?= =?UTF-8?q?=E7=9A=84=E6=96=AD=E7=82=B9=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Slate/Private/Framework/Application/SlateApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp index 0be36dab4..9b3a41a07 100644 --- a/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp +++ b/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp @@ -1874,7 +1874,7 @@ void FSlateApplication::AddModalWindow( TSharedRef InSlateWindow, const UE_LOG(LogSlate, Warning, TEXT("A modal window tried to take control while running in unattended script mode. The window was canceled.")); if (FPlatformMisc::IsDebuggerPresent()) { - UE_DEBUG_BREAK(); + // UE_DEBUG_BREAK(); } else { From a9512e24f7c969f84c7cb0bdc26804441dd01b03 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Sat, 11 Jul 2026 15:54:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96mujoco?= =?UTF-8?q?=E7=9A=84.glb=E6=A8=A1=E5=9E=8B=E5=AF=BC=E5=85=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BB=93=E6=9E=9C=EF=BC=88ImportTask->Result=EF=BC=89?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 从 UE5 引入：https://github.com/EpicGames/UnrealEngine/commit/9e1786b97b3e986a4034cf5d3aeeeeb0cd028fb4 --- Engine/Source/Developer/AssetTools/Private/AssetTools.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp b/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp index a0fada895..af1e50a8a 100644 --- a/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp +++ b/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp @@ -1167,10 +1167,10 @@ void UAssetToolsImpl::ImportAssetTasks(const TArray& ImportTa Params.bAutomated = ImportTask->bAutomated; Params.SpecifiedFactory = ImportTask->Factory; Filenames[0] = ImportTask->Filename; - TArray ImportedObjects = ImportAssetsInternal(Filenames, ImportTask->DestinationPath, nullptr, Params); + ImportTask->Result = ImportAssetsInternal(Filenames, ImportTask->DestinationPath, nullptr, Params); - PackagesToSave.Reset(1); - for (UObject* Object : ImportedObjects) + PackagesToSave.Reset(ImportTask->Result.Num()); + for (UObject* Object : ImportTask->Result) { ImportTask->ImportedObjectPaths.Add(Object->GetPathName()); if (ImportTask->bSave) @@ -2067,6 +2067,7 @@ TArray UAssetToolsImpl::ImportAssetsInternal(const TArray& Fi Factory->SetAssetImportTask(Params.AssetImportTask); ImportAssetType = Factory->ResolveSupportedClass(); + UObject* Result = Factory->ImportObject(ImportAssetType, Pkg, FName(*Name), RF_Public | RF_Standalone | RF_Transactional, Filename, nullptr, bImportWasCancelled); Factory->SetAutomatedAssetImportData(nullptr);