diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-03-24 09:25:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-24 09:25:09 +0100 |
commit | 0682422b1ec91632922201688f5aceb7e241a26c (patch) | |
tree | fef4a1bf036acabfc453142a8f18b90a1819c5db /editor | |
parent | 1829eb460811ca27a985f0d32e40e66042c74649 (diff) | |
parent | 8db565cabddefdfa59d37c7d9dfa86661d0170ed (diff) |
Merge pull request #47311 from RevoluPowered/fix-importer-bug
Fix use of Error its uninitialised and resolves importers being broken
Diffstat (limited to 'editor')
-rw-r--r-- | editor/import/resource_importer_scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index c6ef9b61d7..3abdc5a328 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -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; |