diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-07-24 21:22:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-24 21:22:47 +0200 |
commit | f6599e05a72f9480f0c4a7a28daa897cc496a3df (patch) | |
tree | 52e5cc92a6b7b3413df17a8a832ffda751a44417 | |
parent | 2b1e6e303ed6b0e2ca408f2156b745e711c2bab7 (diff) | |
parent | c0ce2b339732180d1dc6a62b142166c9c1d62a52 (diff) |
Merge pull request #50816 from aaronfranke/iterators-fix-scene-import
Fix scene import following List iterator changes
-rw-r--r-- | editor/import/resource_importer_scene.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index e1aa858b90..d67950ec9e 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1310,9 +1310,9 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file) { List<String> extensions; E->get()->get_extensions(&extensions); - for (String &F : extensions) { + for (const String &F : extensions) { if (F.to_lower() == ext) { - importer = E; + importer = E->get(); break; } } @@ -1350,9 +1350,9 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p List<String> extensions; E->get()->get_extensions(&extensions); - for (String &F : extensions) { + for (const String &F : extensions) { if (F.to_lower() == ext) { - importer = E; + importer = E->get(); break; } } |