Merge branch 'main' into fix-deprecation

moveit · Jul 22, 2024 · 5332422 · 5332422
2 parents d2b1c51 + bc07edf
commit 5332422
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/moveit_core/planning_scene/src/planning_scene.cpp b/moveit_core/planning_scene/src/planning_scene.cpp
@@ -210,6 +210,10 @@ PlanningScene::PlanningScene(const PlanningSceneConstPtr& parent) : parent_(pare
 
   robot_model_ = parent_->robot_model_;
 
+  setStateFeasibilityPredicate(parent->getStateFeasibilityPredicate());
+  setMotionFeasibilityPredicate(parent->getMotionFeasibilityPredicate());
+  setCollisionObjectUpdateCallback(parent_->current_world_object_update_callback_);
+
   // maintain a separate world.  Copy on write ensures that most of the object
   // info is shared until it is modified.
   world_ = std::make_shared<collision_detection::World>(*parent_->world_);
@@ -1204,6 +1208,8 @@ void PlanningScene::decoupleParent()
     }
   }
 
+  setCollisionObjectUpdateCallback(nullptr);
+
   parent_.reset();
 }