Merge pull request #47311 from RevoluPowered/fix-importer-bug

Fix use of Error its uninitialised and resolves importers being broken
This commit is contained in:
Rémi Verschelde 2021-03-24 09:25:09 +01:00 committed by GitHub
commit 0682422b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1302,7 +1302,7 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file) {
ERR_FAIL_COND_V(!importer.is_valid(), nullptr);
Error err;
Error err = OK;
Node *scene = importer->import_scene(p_source_file, EditorSceneImporter::IMPORT_ANIMATION | EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS, 15, nullptr, &err);
if (!scene || err != OK) {
return nullptr;