From b303e73877764e33037a269b7c7092cf6f11f680 Mon Sep 17 00:00:00 2001 From: rune-scape Date: Mon, 17 Jun 2024 17:28:32 -0700 Subject: [PATCH] avoid crashing when scene import settings are empty --- editor/import/3d/resource_importer_scene.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index c0d38af26aa..22caf6e18da 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -2780,6 +2780,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; @@ -2838,6 +2839,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;