6 -> main #592
Merged
6 -> main #592
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
…575) * fix shaders when there is lidar in the scene Signed-off-by: Ian Chen <[email protected]> * style Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]>
…#579) This PR fixes objects with shader material when there is a thermal camera or a segmentation camera in the scene. These sensor all perform material switching during a render update, and the shader materials should now be correctly restored. Also updated test. Signed-off-by: Ian Chen <[email protected]>
* Use libogre-next-dev on jammy Specify different package names for ogre2.2 in distro-specific packages-*.apt files. * Find OGRE-Next with plain cmake Patch adapted from gazebo-release/gz-rendering6-release#8 Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
|
Comments associated with merged forward commits should already be addressed :) |
Codecov Report
@@ Coverage Diff @@
## main #592 +/- ##
==========================================
+ Coverage 53.43% 53.55% +0.11%
==========================================
Files 214 214
Lines 21304 21304
==========================================
+ Hits 11384 11409 +25
+ Misses 9920 9895 -25
Continue to review full report at Codecov.
|
ahcorde
approved these changes
Mar 22, 2022
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 ign-rendering6 to main
Branch comparison: main...ign-rendering6
changes from #575 and #579 are not merged forward. They are replaced by #578 which contains a better fix for
mainNote to maintainers: Remember to Merge with commit (not squash-merge or rebase)