|
@@ -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);
|
|
|
|
- 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());
|
|
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;
|
|
}
|
|
}
|