Fix referring to ResourceImporterScene static importers via instances #82988
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
This was referenced Oct 8, 2023
aaronfranke
force-pushed
the
res-imp-scene-static
branch
2 times, most recently
from
927f99f to
da986a3
Compare
aaronfranke
force-pushed
the
res-imp-scene-static
branch
from
da986a3 to
52f1b86
Compare
akien-mga
approved these changes
Dec 12, 2023
|
Thanks! |
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.
(Note: This will conflict with #82899. We can merge in either order, I will rebase the other PR).
In a small number of places (once in the glTF module and multiple times in the filesystem dock), static data in the
ResourceImporterSceneclass was being referred to by the singleton instance when it did not need to be. This PR fixes those places.Part of the problem is the confusion between the parent class
ResourceImporterworking with "importer"s and this classResourceImporterSceneworking with "importer"s. This PR includes a rename of theResourceImporterSceneimporter methods to "scene_importer" to avoid confusion withResourceImporter's "importer".This PR also reduces code duplication in the filesystem dock, previously it was choosing between the different singletons but now that is no longer necessary.
ResourceImporterScene::get_scene_importer_extensionsis accessing static data so we don't need to use the singletons. Theshow_advanced_optionsmethod is just a shortcut for accessing the scene import dialog and passing along with a bool for if this is the animation dialog or not, so instead of using the singletons of the importer we should just have this part of the editor UI talk to the other part of the editor UI.