Skip to content

Fix bug in applying planning scene diffs that have attached collision objects (#3124) (backport #1251)#1369

Merged
tylerjw merged 1 commit intogalacticfrom
mergify/bp/galactic/pr-1251
Jun 15, 2022
Merged

Fix bug in applying planning scene diffs that have attached collision objects (#3124) (backport #1251)#1369
tylerjw merged 1 commit intogalacticfrom
mergify/bp/galactic/pr-1251

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Jun 15, 2022

This is an automatic backport of pull request #1251 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

… objects (#3124) (#1251)

* Add test that trigger the bug in applying scene that have robot state
diffs

* Fix a bug in planning scene diffs where having applying two diffs would cause them to override the aco

* Fix a bug where removing an attached collision object would keep it in the scene

* Update moveit_core/planning_scene/test/test_planning_scene.cpp

Co-authored-by: AndyZe <andyz@utexas.edu>

* Update moveit_core/planning_scene/test/test_planning_scene.cpp

Co-authored-by: AndyZe <andyz@utexas.edu>

* Update moveit_core/planning_scene/src/planning_scene.cpp

Co-authored-by: AndyZe <andyz@utexas.edu>

* Check parent pointer

Co-authored-by: AndyZe <andyz@utexas.edu>

Co-authored-by: AndyZe <andyz@utexas.edu>
(cherry picked from commit d482c1d)
@tylerjw tylerjw merged commit a44bdb3 into galactic Jun 15, 2022
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/galactic/pr-1251 branch June 15, 2022 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants