From fa1fb09cb24a1df5dc67196f581808d5c5c24ea4 Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Fri, 22 Sep 2023 11:15:21 +0200
Subject: [PATCH] [godot] Closes #2381, regression in SpineSlot::get_bone()

---
 spine-godot/.vscode/launch.json       | 244 ++++++++++++--------------
 spine-godot/spine_godot/SpineSlot.cpp |   2 +-
 2 files changed, 113 insertions(+), 133 deletions(-)

diff --git a/spine-godot/.vscode/launch.json b/spine-godot/.vscode/launch.json
index f89c19e2a..03850e6d3 100644
--- a/spine-godot/.vscode/launch.json
+++ b/spine-godot/.vscode/launch.json
@@ -1,133 +1,113 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "cppvsdbg",
-            "request": "launch",
-            "name": "debug scene v4",
-            "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
-            "args": [
-                "--path",
-                "example-v4",
-                "examples/01-helloworld/helloworld.tscn"
-            ],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "build-v4",
-            "linux": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
-            },
-            "osx": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64",
-            },
-        },
-        {
-            "type": "cppvsdbg",
-            "request": "launch",
-            "name": "debug editor v4",
-            "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
-            "args": [
-                "-e",
-                "--path",
-                "example-v4",
-            ],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "build-v4",
-            "linux": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
-            },
-            "osx": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64",
-            },
-        },
-        {
-            "type": "cppvsdbg",
-            "request": "launch",
-            "name": "debug editor v4 c#",
-            "program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe",
-            "args": [
-                "-e",
-                "--path",
-                "example-v4",
-            ],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "build-v4",
-            "linux": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug editor v4",
-                "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
-            },
-            "osx": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug editor v4",
-                "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono",
-            },
-        },
-        {
-            "type": "cppvsdbg",
-            "request": "launch",
-            "name": "debug scene v3",
-            "cwd": "${workspaceFolder}",
-            "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
-            "args": [
-                "--path",
-                "example",
-                "examples/01-helloworld/helloworld.tscn"
-            ],
-            "preLaunchTask": "build-v3",
-            "linux": {
-                "type": "cppdbg",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64",
-            },
-            "osx": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug scene v3",
-                "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64",
-            },
-        },
-        {
-            "type": "cppvsdbg",
-            "request": "launch",
-            "name": "debug editor v3",
-            "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
-            "args": [
-                "-e",
-                "--path",
-                "example",
-            ],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "build-v3",
-            "linux": {
-                "type": "cppdbg",
-                "request": "launch",
-                "name": "debug editor v3",
-                "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64",
-            },
-            "osx": {
-                "type": "lldb",
-                "request": "launch",
-                "name": "debug editor v3",
-                "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64",
-            },
-        },
-    ]
-}
\ No newline at end of file
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "cppvsdbg",
+      "request": "launch",
+      "name": "debug scene v4",
+      "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
+      "args": ["--path", "example-v4", "examples/07-slot-node/slot-node.tscn"],
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "build-v4",
+      "linux": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
+      },
+      "osx": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64"
+      }
+    },
+    {
+      "type": "cppvsdbg",
+      "request": "launch",
+      "name": "debug editor v4",
+      "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
+      "args": ["-e", "--path", "example-v4"],
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "build-v4",
+      "linux": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
+      },
+      "osx": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64"
+      }
+    },
+    {
+      "type": "cppvsdbg",
+      "request": "launch",
+      "name": "debug editor v4 c#",
+      "program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe",
+      "args": ["-e", "--path", "example-v4"],
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "build-v4",
+      "linux": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug editor v4",
+        "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
+      },
+      "osx": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug editor v4",
+        "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono"
+      }
+    },
+    {
+      "type": "cppvsdbg",
+      "request": "launch",
+      "name": "debug scene v3",
+      "cwd": "${workspaceFolder}",
+      "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
+      "args": ["--path", "example", "examples/01-helloworld/helloworld.tscn"],
+      "preLaunchTask": "build-v3",
+      "linux": {
+        "type": "cppdbg",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64"
+      },
+      "osx": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug scene v3",
+        "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64"
+      }
+    },
+    {
+      "type": "cppvsdbg",
+      "request": "launch",
+      "name": "debug editor v3",
+      "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
+      "args": ["-e", "--path", "example"],
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "build-v3",
+      "linux": {
+        "type": "cppdbg",
+        "request": "launch",
+        "name": "debug editor v3",
+        "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64"
+      },
+      "osx": {
+        "type": "lldb",
+        "request": "launch",
+        "name": "debug editor v3",
+        "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64"
+      }
+    }
+  ]
+}
diff --git a/spine-godot/spine_godot/SpineSlot.cpp b/spine-godot/spine_godot/SpineSlot.cpp
index 067efe269..f620b85dd 100644
--- a/spine-godot/spine_godot/SpineSlot.cpp
+++ b/spine-godot/spine_godot/SpineSlot.cpp
@@ -73,7 +73,7 @@ Ref<SpineSlotData> SpineSlot::get_data() {
 Ref<SpineBone> SpineSlot::get_bone() {
 	SPINE_CHECK(get_spine_object(), nullptr)
 	if (_bone.is_valid()) {
-		return _data;
+		return _bone;
 	} else {
 		auto &bone = get_spine_object()->getBone();
 		Ref<SpineBone> bone_ref(memnew(SpineBone));