Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Engine/Source/Developer/AssetTools/Private/AssetTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1167,10 +1167,10 @@ void UAssetToolsImpl::ImportAssetTasks(const TArray<UAssetImportTask*>& ImportTa
Params.bAutomated = ImportTask->bAutomated;
Params.SpecifiedFactory = ImportTask->Factory;
Filenames[0] = ImportTask->Filename;
TArray<UObject*> 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)
Expand Down Expand Up @@ -2067,6 +2067,7 @@ TArray<UObject*> UAssetToolsImpl::ImportAssetsInternal(const TArray<FString>& 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1874,7 +1874,7 @@ void FSlateApplication::AddModalWindow( TSharedRef<SWindow> 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
{
Expand Down
Loading