UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix compilation error on latest 3.5

Browse Source
This commit is contained in:
Mario Zechner 2022-09-03 12:25:37 +02:00
parent 7a95875ebb
commit 9fcb5007ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-godot/spine_godot/SpineEditorPlugin.cpp
View File

@ -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<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) { Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#endif #endif
Ref<SpineSkeletonFileResource> skeleton_file_res(memnew(SpineSkeletonFileResource)); Ref<SpineSkeletonFileResource> skeleton_file_res(memnew(SpineSkeletonFileResource));
Error error = skeleton_file_res->load_from_file(source_file); 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()); String file_name = vformat("%s.%s", save_path, get_save_extension());
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
error = ResourceSaver::save(skeleton_file_res, file_name); error = ResourceSaver::save(skeleton_file_res, file_name);
#else #else
auto error = ResourceSaver::save(file_name, skeleton_file_res); error = ResourceSaver::save(file_name, skeleton_file_res);
#endif #endif
return error; return error;
} }
@ -90,13 +90,13 @@ Error SpineBinaryResourceImportPlugin::import(const String &source_file, const S
#endif #endif
Ref<SpineSkeletonFileResource> skeleton_file_res(memnew(SpineSkeletonFileResource)); Ref<SpineSkeletonFileResource> skeleton_file_res(memnew(SpineSkeletonFileResource));
Error error = skeleton_file_res->load_from_file(source_file); 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()); String file_name = vformat("%s.%s", save_path, get_save_extension());
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
error = ResourceSaver::save(skeleton_file_res, file_name); error = ResourceSaver::save(skeleton_file_res, file_name);
#else #else
auto error = ResourceSaver::save(file_name, skeleton_file_res); error = ResourceSaver::save(file_name, skeleton_file_res);
#endif #endif
return error; return error;
} }