Merge 8 -> main #1029
Merged
Merge 8 -> main #1029
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Silvio Traversaro <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Benjamin Perseghetti <[email protected]>
Signed-off-by: Benjamin Perseghetti <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
#1012) Signed-off-by: Ian Chen <[email protected]>
The ogre2 plugin fails to load in gz-sim when gz-rendering is built in Debug mode. The following error message is emitted: ``` Error while loading the library [....lib/gz-rendering-8/engine-plugins/libgz-rendering-ogre2.so]: ....lib/gz-rendering-8/engine-plugins/libgz-rendering-ogre2.so: undefined symbol: _ZThn1008_N4Ogre7HlmsPbs19_changeRenderSystemEPNS_12RenderSystemE ``` This is because we set `DEBUG=1` and `_DEBUG=1` on the ogre2 target which seem to change the ABI of the generated library. These defines should really be set if Ogre2 itself is built in debug mode, so this PR simply comments out the CMake command that adds those defines. Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
…re2DepthCamera (#1022) Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Athena Z <[email protected]> Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Martin Pecka <[email protected]>
Merge 6 -> 7 (Partial merge forward)
Merge 7 -> 8
Signed-off-by: Ian Chen <[email protected]>
caguero
approved these changes
Aug 2, 2024
ahcorde
approved these changes
Aug 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port gz-rendering8 to main
Branch comparison: main...gz-rendering8
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)