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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2022-08-17 19:06:31 +02:00
commit 805cd777ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ void SpineEditorPropertyAnimationMixes::update_property() {
hbox->add_child(delete_button); hbox->add_child(delete_button);
delete_button->set_text("Remove"); delete_button->set_text("Remove");
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
delete_button->connect("pressed", callable_mp(this, &SpineEditorPropertyAnimationMixes::delete_mix), i); delete_button->connect("pressed", callable_mp(this, &SpineEditorPropertyAnimationMixes::delete_mix).bind(varray(i)));
#else #else
delete_button->connect("pressed", this, "delete_mix", varray(i)); delete_button->connect("pressed", this, "delete_mix", varray(i));
#endif #endif

2
spine-sdl/README.md
View File

@ -4,7 +4,7 @@ The spine-sdl runtime provides functionality to load, manipulate and render [Spi
# See the [spine-godot documentation](http://esotericsoftware.com/spine-sdl) for in-depth information # See the [spine-godot documentation](http://esotericsoftware.com/spine-sdl) for in-depth information
# See the [spine-godot documentation](http://esotericsoftware.com/spine-sdl) for in-depth information # See the [spine-sdl documentation](http://esotericsoftware.com/spine-sdl) for in-depth information
## Licensing ## Licensing