Skip to content
Snippets Groups Projects
Commit 47358adf authored by Justin Carpentier's avatar Justin Carpentier
Browse files

[wip/pinocchio] Fix compatibility with Ubuntu 14.04 - add missing patches

parent a8d96ef3
No related branches found
No related tags found
No related merge requests found
diff --git src/parsers/urdf/geometry.cpp src/parsers/urdf/geometry.cpp
index bda85b2..ec6a3eb 100644
--- src/parsers/urdf/geometry.cpp
+++ src/parsers/urdf/geometry.cpp
@@ -334,8 +334,13 @@ namespace se3
{
meshPath.clear();
#ifdef WITH_HPP_FCL
+#ifdef URDFDOM_COLLISION_WITH_GROUP_NAME
+ const std::string & geom_name = (*i)->group_name;
+#else
+ const std::string & geom_name = (*i)->name;
+#endif
const boost::shared_ptr<fcl::CollisionGeometry> geometry =
- retrieveCollisionGeometry(tree, link_name, (*i)->name,
+ retrieveCollisionGeometry(tree, link_name, geom_name,
(*i)->geometry, package_dirs, meshPath, meshScale);
#else
::urdf::MeshSharedPtr urdf_mesh = ::urdf::dynamic_pointer_cast< ::urdf::Mesh> ((*i)->geometry);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment