Ver Fonte

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

Fix use of Error its uninitialised and resolves importers being broken
Rémi Verschelde há 4 anos atrás
pai
commit
0682422b1e
1 ficheiros alterados com 1 adições e 1 exclusões
  1. 1 1
      editor/import/resource_importer_scene.cpp

+ 1 - 1
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);
 	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);
 	Node *scene = importer->import_scene(p_source_file, EditorSceneImporter::IMPORT_ANIMATION | EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS, 15, nullptr, &err);
 	if (!scene || err != OK) {
 	if (!scene || err != OK) {
 		return nullptr;
 		return nullptr;