asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #96122 from SaracenOne/fix_post_import_regression

Browse source 
Prevent empty post-import script paths throwing errors.
This commit is contained in:
Rémi Verschelde 2024-08-26 22:46:14 +02:00
commit 7e8fffa008
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/import/3d/resource_importer_scene.cpp
View file

@ -3058,13 +3058,13 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
progress.step(TTR("Running Custom Script..."), 2); progress.step(TTR("Running Custom Script..."), 2);
String post_import_script_path = p_options["import_script/path"]; String post_import_script_path = p_options["import_script/path"];
if (post_import_script_path.is_relative_path()) {
post_import_script_path = p_source_file.get_base_dir().path_join(post_import_script_path);
}
Ref<EditorScenePostImport> post_import_script; Ref<EditorScenePostImport> post_import_script;
if (!post_import_script_path.is_empty()) { if (!post_import_script_path.is_empty()) {
if (post_import_script_path.is_relative_path()) {
post_import_script_path = p_source_file.get_base_dir().path_join(post_import_script_path);
}
Ref<Script> scr = ResourceLoader::load(post_import_script_path); Ref<Script> scr = ResourceLoader::load(post_import_script_path);
if (!scr.is_valid()) { if (!scr.is_valid()) {
EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path); EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path);