From 2b6f94c8af03230ac61d469d65a481738280782f Mon Sep 17 00:00:00 2001 From: XGodina Date: Tue, 22 Nov 2022 16:31:20 +0100 Subject: [PATCH] Fix PR request2 --- PythonAPI/carla/source/libcarla/World.cpp | 2 -- Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/PythonAPI/carla/source/libcarla/World.cpp b/PythonAPI/carla/source/libcarla/World.cpp index ad969e8e2..842bec5b1 100644 --- a/PythonAPI/carla/source/libcarla/World.cpp +++ b/PythonAPI/carla/source/libcarla/World.cpp @@ -228,8 +228,6 @@ void export_world() { .value("Truck", cr::CityObjectLabel::Truck) .value("Motorcycle", cr::CityObjectLabel::Motorcycle) .value("Bicycle", cr::CityObjectLabel::Bicycle) - - .value("Any", cr::CityObjectLabel::Any) ; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp index cfddf31e0..01744f2e1 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp @@ -49,7 +49,6 @@ crp::CityObjectLabel ATagger::GetLabelByFolderName(const FString &String) { else if (String == "Truck") return crp::CityObjectLabel::Truck; else if (String == "Motorcycle") return crp::CityObjectLabel::Motorcycle; else if (String == "Bicycle") return crp::CityObjectLabel::Bicycle; - else return crp::CityObjectLabel::None; }