diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:08 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:59 -0500 |
| commit | 3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d (patch) | |
| tree | c7341bd56c977259578b127886c9a88eeef11820 /editor/import/3d/resource_importer_scene.cpp | |
| parent | 5094c2a5f7d506b0e685120f14d1df42e1e9d495 (diff) | |
| parent | cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e (diff) | |
| download | redot-engine-3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d.tar.gz | |
Merge commit godotengine/godot@cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e
Diffstat (limited to 'editor/import/3d/resource_importer_scene.cpp')
| -rw-r--r-- | editor/import/3d/resource_importer_scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 4b5c23b788..554d6bc748 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -2874,7 +2874,7 @@ Error ResourceImporterScene::_check_resource_save_paths(const Dictionary &p_data return OK; } -Error ResourceImporterScene::import(const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) { +Error ResourceImporterScene::import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) { const String &src_path = p_source_file; Ref<EditorSceneFormatImporter> importer; @@ -3094,7 +3094,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p if (!scr.is_valid()) { EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path); } else { - post_import_script = Ref<EditorScenePostImport>(memnew(EditorScenePostImport)); + post_import_script.instantiate(); post_import_script->set_script(scr); if (!post_import_script->get_script_instance()) { EditorNode::add_io_error(TTR("Invalid/broken script for post-import (check console):") + " " + post_import_script_path); |