godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93284 from rune-scape/missing-import-settings-crash 

Avoid crashing when scene import settings are empty
This commit is contained in:
Rémi Verschelde 2024-07-31 11:37:34 +02:00
parent f763962aed b303e73877
commit 9fe4cb6a76
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/import/3d/resource_importer_scene.cpp
View File

@ -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;