From a55b64222a0c37e48dfd20ab15688c5e4d8adb76 Mon Sep 17 00:00:00 2001 From: werner291 Date: Tue, 14 Sep 2021 12:34:47 +0200 Subject: [PATCH] Fixed Bullet collision checker not taking defaults into account. (#2871) --- .../bullet_integration/bullet_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit_core/collision_detection_bullet/include/moveit/collision_detection_bullet/bullet_integration/bullet_utils.h b/moveit_core/collision_detection_bullet/include/moveit/collision_detection_bullet/bullet_integration/bullet_utils.h index bcaf4210c4..b4f82f00a5 100644 --- a/moveit_core/collision_detection_bullet/include/moveit/collision_detection_bullet/bullet_integration/bullet_utils.h +++ b/moveit_core/collision_detection_bullet/include/moveit/collision_detection_bullet/bullet_integration/bullet_utils.h @@ -65,7 +65,7 @@ inline bool acmCheck(const std::string& body_1, const std::string& body_2, if (acm != nullptr) { - if (acm->getEntry(body_1, body_2, allowed_type)) + if (acm->getAllowedCollision(body_1, body_2, allowed_type)) { if (allowed_type == collision_detection::AllowedCollision::Type::NEVER) {