Merge branch 'ign-gazebo4' into gonzodepedro/world_exporter

gazebosim · Jan 28, 2021 · 9921e82 · 9921e82
2 parents 073bc91 + 8fd9b26
commit 9921e82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/SimulationRunner.cc b/src/SimulationRunner.cc
@@ -872,18 +872,18 @@ void SimulationRunner::LoadLoggingPlugins(const ServerConfig &_config)
 {
  std::list<ServerConfig::PluginInfo> plugins;
 
- if(_config.UseLogRecord() && !_config.LogPlaybackPath().empty())
+ if (_config.UseLogRecord() && !_config.LogPlaybackPath().empty())
  {
  ignwarn <<
  "Both recording and playback are specified, defaulting to playback\n";
  }
 
- if(!_config.LogPlaybackPath().empty())
+ if (!_config.LogPlaybackPath().empty())
  {
  auto playbackPlugin = _config.LogPlaybackPlugin();
  plugins.push_back(playbackPlugin);
  }
- else if(_config.UseLogRecord())
+ else if (_config.UseLogRecord())
  {
  auto recordPlugin = _config.LogRecordPlugin();
  plugins.push_back(recordPlugin);

diff --git a/test/integration/logical_camera_system.cc b/test/integration/logical_camera_system.cc
@@ -190,5 +190,4 @@ TEST_F(LogicalCameraTest, LogicalCameraBox)
  ignition::math::Pose3d boxPoseCamera2Frame = boxPose - sensor2Pose;
  EXPECT_EQ(boxPoseCamera2Frame, ignition::msgs::Convert(img2.model(0).pose()));
  mutex.unlock();
-
 }