diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp index d4f9bf76b..9d705fafe 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/MoveAssetsCommandlet.cpp @@ -89,12 +89,6 @@ void MoveFiles(const TArray &Assets, const FString &DestPath) new(AssetsAndNames) FAssetRenameData(Asset, DestPath, Asset->GetName()); } - std::cerr << "These are the assets we are going to move: " << std::endl; - for (const auto& asset: AssetsAndNames) { - std::cerr << "\tFrom: " << TCHAR_TO_ANSI(*asset.OldObjectPath.GetAssetPathString()) << std::endl; - std::cerr << "\tTo: " << TCHAR_TO_ANSI(*asset.NewObjectPath.GetAssetPathString()) << std::endl; - } - if (AssetsAndNames.Num() > 0) { AssetToolsModule.Get().RenameAssetsWithDialog(AssetsAndNames); @@ -124,7 +118,6 @@ void UMoveAssetsCommandlet::MoveAssetsFromMapForSemanticSegmentation( AssetDataMap.Add(Paths, {}); } - std::cerr << "Time to move " << MapContents.Num() << " assets." << std::endl; for (const auto &MapAsset : MapContents) { @@ -135,17 +128,12 @@ void UMoveAssetsCommandlet::MoveAssetsFromMapForSemanticSegmentation( FString AssetName; MapAsset.AssetName.ToString(AssetName); - std::cerr << "Moving Object: " << TCHAR_TO_ANSI(*ObjectName) << std::endl; - std::cerr << "Moving Asset: " << TCHAR_TO_ANSI(*AssetName) << std::endl; if (SrcPath.Len()) { const FString CurrentPackageName = MeshAsset->GetOutermost()->GetName(); - std::cerr << "Package name: " << TCHAR_TO_ANSI(*CurrentPackageName) << std::endl; - std::cerr << "Source path: " << TCHAR_TO_ANSI(*SrcPath) << std::endl; - if (!ensure(CurrentPackageName.StartsWith(SrcPath))) { continue; @@ -172,7 +160,6 @@ void UMoveAssetsCommandlet::MoveAssetsFromMapForSemanticSegmentation( for (const auto &Elem : AssetDataMap) { FString DestPath = TEXT("/Game/") + PackageName + TEXT("/Static/") + Elem.Key + "/" + MapName; - std::cerr << "Now moving all " << TCHAR_TO_ANSI(*Elem.Key) << " to " << TCHAR_TO_ANSI(*DestPath) << std::endl; MoveFiles(Elem.Value, DestPath); } } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp index 48d5bd872..3c446b48e 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp @@ -222,10 +222,6 @@ bool UPrepareAssetsForCookingCommandlet::SaveWorld( SavePackage(PackagePath, Package); } - #if WITH_EDITOR - UEditorLoadingAndSavingUtils::SaveMap(World, PackagePath); - #endif - return bPackageSaved; } @@ -320,11 +316,6 @@ bool UPrepareAssetsForCookingCommandlet::SavePackage(const FString &PackagePath, FString PackageFileName = FPackageName::LongPackageNameToFilename(PackagePath, FPackageName::GetMapPackageExtension()); - if (FPaths::FileExists(*PackageFileName)) - { - // Will not save package if it already exists - return false; - } return UPackage::SavePackage(Package, World, EObjectFlags::RF_Public | EObjectFlags::RF_Standalone, *PackageFileName, GError, nullptr, true, true, SAVE_NoError); }