ogre 1.10: prevent loading resource under same name twice #1094
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
|
Apologies, I just noticed #1063. I'll close this PR. |
130s
pushed a commit
to 130s/rviz
that referenced
this pull request
Aug 21, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> (cherry picked from commit d5b274fae5829ad43b12abbbb1f29f773fa6a6ce) Co-authored-by: Alejandro Hernández Cordero <alejandro@openrobotics.org>
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.
In Ogre 1.10 it is now an error to load a resource under the same name twice, even when it is the same resource.
This seems a bit odd when resources are automatically loaded from shader programs, considering they are supposed to be able to re-use functions from other files. That's exactly what was happening with some shaders included with rviz, as also described in #1049.
This PR applies the fix described there by @phil0stine.