From 9fcb5007ec7284353a0507410f3632779117ea17 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Sat, 3 Sep 2022 12:25:37 +0200 Subject: [PATCH] [godot] Fix compilation error on latest 3.5 --- spine-godot/spine_godot/SpineEditorPlugin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spine-godot/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp index 0bb424cae..ab97eeecc 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.cpp +++ b/spine-godot/spine_godot/SpineEditorPlugin.cpp @@ -71,14 +71,14 @@ Error SpineJsonResourceImportPlugin::import(const String &source_file, const Str Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) { #endif Ref skeleton_file_res(memnew(SpineSkeletonFileResource)); - Error error = skeleton_file_res->load_from_file(source_file); - if (error != OK) return error; + Error error = skeleton_file_res->load_from_file(source_file); + if (error != OK) return error; String file_name = vformat("%s.%s", save_path, get_save_extension()); #if VERSION_MAJOR > 3 error = ResourceSaver::save(skeleton_file_res, file_name); #else - auto error = ResourceSaver::save(file_name, skeleton_file_res); + error = ResourceSaver::save(file_name, skeleton_file_res); #endif return error; } @@ -90,13 +90,13 @@ Error SpineBinaryResourceImportPlugin::import(const String &source_file, const S #endif Ref skeleton_file_res(memnew(SpineSkeletonFileResource)); Error error = skeleton_file_res->load_from_file(source_file); - if (error != OK) return error; + if (error != OK) return error; String file_name = vformat("%s.%s", save_path, get_save_extension()); #if VERSION_MAJOR > 3 error = ResourceSaver::save(skeleton_file_res, file_name); #else - auto error = ResourceSaver::save(file_name, skeleton_file_res); + error = ResourceSaver::save(file_name, skeleton_file_res); #endif return error; }