Skip to content

Commit 9fe4cb6

Browse files
committed
Merge pull request #93284 from rune-scape/missing-import-settings-crash
Avoid crashing when scene import settings are empty
2 parents f763962 + b303e73 commit 9fe4cb6

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

editor/import/3d/resource_importer_scene.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2806,6 +2806,7 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM
28062806
}
28072807

28082808
ERR_FAIL_COND_V(!importer.is_valid(), nullptr);
2809+
ERR_FAIL_COND_V(p_options.is_empty(), nullptr);
28092810

28102811
Error err = OK;
28112812

@@ -2864,6 +2865,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
28642865
}
28652866

28662867
ERR_FAIL_COND_V(!importer.is_valid(), ERR_FILE_UNRECOGNIZED);
2868+
ERR_FAIL_COND_V(p_options.is_empty(), ERR_BUG);
28672869

28682870
int import_flags = 0;
28692871

0 commit comments

Comments
 (0)