Merge part of 6 -> main #590
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
The ign-math Pose addition operator is going to be deprecated, so use the multiplication operator instead. It works in the opposite order, matching the behavior of coordinate transform multiplication. Signed-off-by: Steve Peters <[email protected]>
…574) * do not set constants for textures if not opengl Signed-off-by: Ian Chen <[email protected]> * backport graphics api accessor function Signed-off-by: Ian Chen <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #590 +/- ##
==========================================
- Coverage 53.43% 53.43% -0.01%
==========================================
Files 214 214
Lines 21301 21304 +3
==========================================
+ Hits 11383 11384 +1
- Misses 9918 9920 +2
Continue to review full report at Codecov.
|
chapulina
approved these changes
Mar 21, 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 as of 996c58d to main
I tried merging the tip of
ign-rendering6, but there are significant conflicts with main when merging forward #575 and #579, so I would request that @iche033 handle that merge.Branch comparison: main...996c58d
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)