Browse Source

Merge pull request #96122 from SaracenOne/fix_post_import_regression

Prevent empty post-import script paths throwing errors.
Rémi Verschelde 1 year ago
parent
commit
7e8fffa008
1 changed files with 3 additions and 3 deletions
  1. 3 3
      editor/import/3d/resource_importer_scene.cpp

+ 3 - 3
editor/import/3d/resource_importer_scene.cpp

@@ -3058,13 +3058,13 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
 	progress.step(TTR("Running Custom Script..."), 2);
 
 	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;
 
 	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);
 		if (!scr.is_valid()) {
 			EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path);