Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Mar 25, 2024
1 parent f42522b commit f5f9d17
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/mj_utils_merge_mujoco_models.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -347,17 +347,17 @@ static void merge_mujoco_model(const std::string & robot, const std::string & xm
bfs::path include_file_path(inc.attribute("file").value());
if(!include_file_path.is_absolute())
{
bfs::path xmlPath = bfs::path(xmlFile).parent_path();
include_file_path = xmlPath / include_file_path;
bfs::path xmlPath = bfs::path(xmlFile).parent_path();
include_file_path = xmlPath / include_file_path;
}
pugi::xml_document includeDoc;
if (!includeDoc.load_file(include_file_path.c_str()))
if(!includeDoc.load_file(include_file_path.c_str()))
{
mc_rtc::log::error_and_throw<std::runtime_error>("Failed to load {}", include_file_path.c_str());
mc_rtc::log::error_and_throw<std::runtime_error>("Failed to load {}", include_file_path.c_str());
}
for(pugi::xml_node include_node : includeDoc.child("mujoco").children())
{
out.append_copy(include_node);
out.append_copy(include_node);
}
}
};
Expand Down

0 comments on commit f5f9d17

Please sign in to comment.