Closed mergify[bot] closed 1 month ago
Cherry-pick of 330f1c9b6d4bce6716017f13d1c06e712b19a44f has failed:
On branch mergify/bp/garden/pr-26
Your branch is up to date with 'origin/garden'.
You are currently cherry-picking commit 330f1c9.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: src/sdf_parser/Geometry.cc
modified: src/usd_parser/USDLinks.cc
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CMakeLists.txt
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
🎉 New feature
Summary
Cone shapes were added to Ionic and backported to Harmonic in sdformat 14.4. This adds support for converting cone shapes between SDFormat and USD.
Test it
Attempting to convert the gz-sim shapes.sdf example world on
main
causes the conversion to fail with error messages like the following:It works properly with this branch.
Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.This is an automatic backport of pull request #26 done by Mergify.