[godot] Godot 4.3 updates

EsotericSoftware · Aug 19, 2024 · f3ded1e · f3ded1e
1 parent 59e3b58
commit f3ded1e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/spine-godot-v4-all.yml b/.github/workflows/spine-godot-v4-all.yml
@@ -14,10 +14,10 @@ jobs:
       matrix:
         version:
           [
-            {"tag": "4.1.4-stable", "version": "4.1.4.stable", "mono": false},
-            {"tag": "4.1.4-stable", "version": "4.1.4.stable", "mono": true},
             {"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": false},
             {"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": true},
+            {"tag": "4.2-stable", "version": "4.2.stable", "mono": false},
+            {"tag": "4.2-stable", "version": "4.2.stable", "mono": true},
           ]
     uses: ./.github/workflows/spine-godot-v4.yml
     with:

diff --git a/spine-godot/spine_godot/SpineAnimationTrack.cpp b/spine-godot/spine_godot/SpineAnimationTrack.cpp
@@ -182,8 +182,8 @@ void SpineAnimationTrack::setup_animation_player() {
 #if VERSION_MAJOR > 3
 		List<StringName> animation_libraries;
 		animation_player->get_animation_library_list(&animation_libraries);
-		for (int i = 0; i < animation_libraries.size(); i++) {
-			animation_player->remove_animation_library(animation_libraries[i]);
+		  for (auto iter = animation_libraries.front(); iter; iter = iter->next()) {
+			animation_player->remove_animation_library(iter->get());
 		}
 #else
 		List<StringName> animation_names;

diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp
@@ -53,8 +53,12 @@
 #include "scene/main/viewport.h"
 
 #if TOOLS_ENABLED
+#if VERSION_MAJOR > 4 && VERSION_MINOR > 2
+#include "editor/plugins/editor_plugin.h"
+else
 #include "editor/editor_plugin.h"
 #endif
+#endif
 
 Ref<CanvasItemMaterial> SpineSprite::default_materials[4] = {};
 static int sprite_count = 0;