Merge 6 -> main #647
Merged
Merge 6 -> main #647
+33
−11
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
…626) Signed-off-by: Ian Chen <[email protected]>
* spdlog logging integration. Signed-off-by: Michael Carroll <[email protected]> Signed-off-by: Carlos Agüero <[email protected]> Signed-off-by: Addisu Z. Taddese <[email protected]> (cherry picked from commit 6cb5a53)
Signed-off-by: Ian Chen <[email protected]>
Fixes UNIT_AssimpLoader_TEST with assimp 5.4.3. This should fix homebrew CI. This PR tweaks the way we checks for texture coordinates from assimp. Empty texture coordinate slots are now allowed as of assimp/assimp#5636. The new logic should be compatible with assimp 5.4.3 and prior versions Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
The severity level of `gzlog` was incorrectly set to `err`. Changing this to `trace` solves two problems: 1. The log message is now a lot less alarming 2. When running `gz sim -v4`, this message is not shown on the console. It will only be logged to file. It does show up on the console if you run with `-v5`. The second point is technically a behavior change since in Harmonic, regardless of the verbosity level, `gzlog` would never show up on the console. However, duplicating that behavior with the new Console implementation proved to be very complicated. So, I propose we change the meaning of `gzlog` to be equivalent to `gztrace`. Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Van Malleghem Antoine <[email protected]>
…ndows (#640) Signed-off-by: Martin Pecka <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Silvio Traversaro <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
ahcorde
approved these changes
Oct 8, 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-common6 to main
Branch comparison: main...gz-common6
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)