Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors/crashes related to skipped imports #91078

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

aaronp64
Copy link
Contributor

  • Added check for "animation/fps" key before attempting to use it in EditorSceneFormatImporterBlend::import_scene, to give error instead of crashing

  • Don't show "Advanced..." button if last import used "Keep File" or "Skip File"

  • Don't try to call ResourceLoader::load on kept/skipped file when changing importer, which would give an error

Fixes #90324

@aaronp64 aaronp64 requested review from a team as code owners April 23, 2024 21:21
@akien-mga akien-mga added this to the 4.3 milestone Apr 24, 2024
editor/import_dock.cpp Outdated Show resolved Hide resolved
- Added check for "animation/fps" key before attempting to use it in EditorSceneFormatImporterBlend::import_scene, to give error instead of crashing

- Don't show "Advanced..." button if last import used "Keep File" or "Skip File"

- Don't try to call ResourceLoader::load on kept/skipped file when changing importer, which would give an error

Fixes godotengine#90324
@aaronp64 aaronp64 force-pushed the import_skip_crash branch from 3443633 to e63d098 Compare April 25, 2024 14:34
@akien-mga akien-mga added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Apr 25, 2024
@akien-mga akien-mga merged commit f859400 into godotengine:master Apr 25, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@aaronp64 aaronp64 deleted the import_skip_crash branch May 13, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release topic:import
Projects
None yet
4 participants