Backwards compatible assimp texture name fix #565
Merged
+12
−1
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.
🦟 Bug fix
Supersedes #564
Summary
Apologies for the noise! Hopefully third time is the charm? When working on #564 and #563 I realized that we do have a way to ship changes that depend on the assimp version, by using a define.
This allows us to have the fix in Harmonic (LTS) without being blocked by the fact that
gz-common4
is also shipped in Garden (that is short term support anyway).If it's desirable I can open a PR targeting main that gets rid of all the
ifdef
s since they are only needed for compatibility with assimp 5.0.x that was last shipped in Ubuntu 20.04.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.