diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-31 11:37:34 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-31 11:37:34 +0200 |
commit | 9fe4cb6a769b14ddf3d9974767115a5f686f5f10 (patch) | |
tree | e3892473248eb5a762f1290722e304210a8a8402 | |
parent | f763962aed4a4a4383033d46497cad2a9e84efa8 (diff) | |
parent | b303e73877764e33037a269b7c7092cf6f11f680 (diff) | |
download | redot-engine-9fe4cb6a769b14ddf3d9974767115a5f686f5f10.tar.gz |
Merge pull request #93284 from rune-scape/missing-import-settings-crash
Avoid crashing when scene import settings are empty
-rw-r--r-- | editor/import/3d/resource_importer_scene.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 5ee4322a22..df4026195c 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -2806,6 +2806,7 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM } ERR_FAIL_COND_V(!importer.is_valid(), nullptr); + ERR_FAIL_COND_V(p_options.is_empty(), nullptr); Error err = OK; @@ -2864,6 +2865,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p } ERR_FAIL_COND_V(!importer.is_valid(), ERR_FILE_UNRECOGNIZED); + ERR_FAIL_COND_V(p_options.is_empty(), ERR_BUG); int import_flags = 0; |