p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Blyron 2024-05-28 11:49:41 +02:00
parent b86b1997fc 7b2ff04496
commit 5043ad73fc
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PythonAPI/test/smoke/test_sensor_tick_time.py
View File

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

3
Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
View File

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

2
Util/BuildTools/Setup.sh
View File

@ -761,7 +761,7 @@ cp -p ${PROJ_SERVER_LIB} ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
# -- Get and compile patchelf -------------------------------------------------- # -- 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_REPO=https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz
PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz