[godot] Fixes for 4.4, see #2801

spine-godot/spine_godot/SpineEditorPlugin.cpp

@@ -42,8 +42,12 @@
 #ifdef SPINE_GODOT_EXTENSION
 Error SpineAtlasResourceImportPlugin::_import(const String &source_file, const String &save_path, const Dictionary &options, const TypedArray<String> &platform_variants, const TypedArray<String> &gen_files) const {
 #else
+#if VERSION_MINOR > 3
+Error SpineAtlasResourceImportPlugin::import(ResourceUID::ID p_source_id, const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
+#else
 Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
 #endif
+#endif
 #else
 Error SpineAtlasResourceImportPlugin::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
@@ -98,8 +102,12 @@ void SpineAtlasResourceImportPlugin::get_import_options(List<ImportOption> *opti
 #ifdef SPINE_GODOT_EXTENSION
 Error SpineJsonResourceImportPlugin::_import(const String &source_file, const String &save_path, const Dictionary &options, const TypedArray<String> &platform_variants, const TypedArray<String> &gen_files) const {
 #else
+#if VERSION_MINOR > 3
+Error SpineJsonResourceImportPlugin::import(ResourceUID::ID p_source_id, const String &source_file, const String &save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
+#else
 Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
 #endif
+#endif
 #else
 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
@@ -126,8 +134,12 @@ Error SpineJsonResourceImportPlugin::import(const String &source_file, const Str
 #ifdef SPINE_GODOT_EXTENSION
 Error SpineBinaryResourceImportPlugin::_import(const String &source_file, const String &save_path, const Dictionary &options, const TypedArray<String> &platform_variants, const TypedArray<String> &gen_files) const {
 #else
+#if VERSION_MINOR > 3
+Error SpineBinaryResourceImportPlugin::import(ResourceUID::ID p_source_id, const String &source_file, const String &save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
+#else
 Error SpineBinaryResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
 #endif
+#endif
 #else
 Error SpineBinaryResourceImportPlugin::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

spine-godot/spine_godot/SpineEditorPlugin.h

@@ -107,9 +107,12 @@ public:
 	void get_import_options(const String &path, List<ImportOption> *options, int preset) const override;
 
 	virtual bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
-
+#if VERSION_MINOR > 3
+	Error import(ResourceUID::ID p_source_id, const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr) override;
+#else
 	Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
 #endif
+#endif
 #else
 	void get_import_options(List<ImportOption> *options, int preset) const override;
 
@@ -182,8 +185,12 @@ public:
 
 	bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
 
+#if VERSION_MINOR > 3
+	Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr) override;
+#else
 	Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
 #endif
+#endif
 #else
 	void get_import_options(List<ImportOption> *options, int preset) const override {}
 
@@ -255,9 +262,12 @@ public:
 	void get_import_options(const String &path, List<ImportOption> *options, int preset) const override {}
 
 	bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
-
+#if VERSION_MINOR > 3
+	Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr) override;
+#else
 	Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
 #endif
+#endif
 #else
 	void get_import_options(List<ImportOption> *options, int preset) const override {}
 
@@ -280,8 +290,12 @@ public:
 #else
 	explicit SpineEditorPlugin(EditorNode *node);
 
+#if VERSION_MINOR > 3
+	String get_plugin_name() const override { return "SpineEditorPlugin"; }
+#else
 	String get_name() const override { return "SpineEditorPlugin"; }
 #endif
+#endif
 };
 
 class SpineSkeletonDataResourceInspectorPlugin : public EditorInspectorPlugin {

spine-godot/spine_godot/SpineSprite.cpp

@@ -59,6 +59,7 @@
 #include "core/variant/array.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering_server.h"
+#include "scene/resources/canvas_item_material.h"
 #if VERSION_MINOR > 0
 #include "editor/editor_interface.h"
 #endif