Merge gz-common5 ➡️ main #541
Merged
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
…-metallic-roughness texture (#538) * Prevent loading lightmaps if mesh is a glb file --------- Signed-off-by: Ian Chen <[email protected]>
The EnumIterator inherits from std::iterator, which has been deprecated in c++17. There is a fix in gz-common6 but it breaks API, so it can't be merged to Garden. So just suppress the deprecation warning in Garden. Signed-off-by: Steve Peters <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #541 +/- ##
==========================================
- Coverage 83.22% 83.21% -0.02%
==========================================
Files 82 82
Lines 9883 9877 -6
==========================================
- Hits 8225 8219 -6
Misses 1658 1658
|
ahcorde
approved these changes
Oct 9, 2023
mjcarroll
approved these changes
Oct 9, 2023
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-common5➡️mainBranch comparison: main...gz-common5
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)