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

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

This commit is contained in:
Blyron 2024-11-05 16:10:19 +01:00
parent fcd19c718c 218b1d46f1
commit c77c128b15
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PythonAPI/examples/manual_control_with_traffic.py
View File

@ -179,6 +179,7 @@ def get_actor_blueprints(world, filter, generation):
class World(object):
def __init__(self, carla_world, hud, args):
self.world = carla_world
self.args = args
self.sync = args.sync
self.actor_role_name = args.rolename
try:

3
Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp
View File

@ -691,7 +691,8 @@ void FCarlaServer::FPimpl::BindActions()
auto *Weather = Episode->GetWeather();
if (Weather == nullptr)
{
RESPOND_ERROR("internal error: unable to find weather:: weather is disabled");
UE_LOG(LogCarla, Error, TEXT("internal error: unable to find weather:: weather is disabled"));
return cr::WeatherParameters();
}
return Weather->GetCurrentWeather();
};