From f2930a411624557a1dd22d38831e5a2188903702 Mon Sep 17 00:00:00 2001 From: Roel Algaba Brizuela Date: Mon, 17 May 2021 22:32:29 +0200 Subject: [PATCH] Changed material routes and import.py --- .../Commandlet/PrepareAssetsForCookingCommandlet.cpp | 4 ++-- Util/BuildTools/Import.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp index 36aea6560..beae7294f 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp @@ -50,9 +50,9 @@ UPrepareAssetsForCookingCommandlet::UPrepareAssetsForCookingCommandlet() // Get Carla Default materials, these will be used for maps that need to use // Carla materials static ConstructorHelpers::FObjectFinder MarkingNode(TEXT( - "MaterialInstanceConstant'/Game/Carla/Static/GenericMaterials/RoadPainterMaterials/M_Road_03_LMW.M_Road_03_LMW'")); + "MaterialInstanceConstant'/Game/Carla/Static/GenericMaterials/RoadPainterMaterials/LargeMaps/M_Road_03_Tiled_V3.M_Road_03_Tiled_V3'")); static ConstructorHelpers::FObjectFinder RoadNode(TEXT( - "MaterialInstanceConstant'/Game/Carla/Static/GenericMaterials/RoadPainterMaterials/LargeMaps/M_Road_03_Tiled.M_Road_03_Tiled'")); + "MaterialInstanceConstant'/Game/Carla/Static/GenericMaterials/RoadPainterMaterials/LargeMaps/M_Road_03_Tiled_V2.M_Road_03_Tiled_V2'")); static ConstructorHelpers::FObjectFinder RoadNodeAux(TEXT( "MaterialInstanceConstant'/Game/Carla/Static/GenericMaterials/RoadPainterMaterials/M_Road_03_LMY.M_Road_03_LMY'")); static ConstructorHelpers::FObjectFinder TerrainNodeMaterial(TEXT( diff --git a/Util/BuildTools/Import.py b/Util/BuildTools/Import.py index e21013e50..dd0ab42ec 100755 --- a/Util/BuildTools/Import.py +++ b/Util/BuildTools/Import.py @@ -429,15 +429,9 @@ def import_assets_from_json_list(json_list): prepare_maps_commandlet_for_cooking(package_name, only_prepare_maps=True) # We apply the carla materials to the imported maps - load_asset_materials_commandlet(package_name) + # load_asset_materials_commandlet(package_name) thr.join() -def load_asset_materials_commandlet(package_name): - commandlet_name = "LoadAssetMaterials" - commandlet_arguments = ["-PackageName=%s" % package_name] - invoke_commandlet(commandlet_name, commandlet_arguments) - - def load_asset_materials_commandlet(package_name): commandlet_name = "LoadAssetMaterials" commandlet_arguments = ["-PackageName=%s" % package_name]