Fixes merge conflicts

moveit · Nov 18, 2024 · 695d1c7 · 695d1c7
1 parent 4ef4ccd
commit 695d1c7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1,442 deletions.
diff --git a/moveit_core/collision_detection/include/moveit/collision_detection/collision_common.h b/moveit_core/collision_detection/include/moveit/collision_detection/collision_common.h
diff --git a/moveit_core/collision_detection/include/moveit/collision_detection/collision_common.hpp b/moveit_core/collision_detection/include/moveit/collision_detection/collision_common.hpp
@@ -150,6 +150,12 @@ struct CollisionRequest
    * are included. */
   std::string group_name = "";
 
+  /** \brief If true, use padded collision environment */
+  bool pad_environment_collisions = true;
+
+  /** \brief If true, do self collision check with padded robot links */
+  bool pad_self_collisions = false;
+
   /** \brief If true, compute proximity distance */
   bool distance = false;