Merge branch 'dev' of https://github.com/carla-simulator/carla into dev

PythonAPI/test/smoke/test_sensor_tick_time.py

@@ -38,7 +38,9 @@ class TestSensorTickTime(SyncSmokeTest):
       "sensor.camera.semantic_segmentation",
       "sensor.camera.dvs",
       "sensor.other.obstacle",
-      "sensor.camera.instance_segmentation"
+      "sensor.camera.instance_segmentation",
+      "sensor.other.v2x",
+      "sensor.other.v2x_custom"
     }
     spawned_sensors = []
     sensor_tick = 1.0
@@ -64,5 +66,3 @@ class TestSensorTickTime(SyncSmokeTest):
       self.assertEqual(sensor.num_ticks, num_sensor_ticks,
         "\n\n {} does not match tick count".format(sensor.bp_sensor.id))
       sensor.destroy()
-
-

Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp

@@ -363,7 +363,10 @@ void UOpenDriveToMap::GenerateTile(){
 
     UEditorLoadingAndSavingUtils::SaveDirtyPackages(true, true);
     UEditorLevelLibrary::SaveCurrentLevel();
+#if PLATFORM_LINUX
     RemoveFromRoot();
+#endif
+
   }
 }
 

Util/BuildTools/Setup.sh

@@ -761,7 +761,7 @@ cp -p ${PROJ_SERVER_LIB} ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
 # -- Get and compile patchelf --------------------------------------------------
 # ==============================================================================
 
-PATCHELF_VERSION=0.14
+PATCHELF_VERSION=0.12
 PATCHELF_REPO=https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz
 
 PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz