UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +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 2023-02-08 13:01:23 +01:00
commit f2bfb50b54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-godot/spine_godot/SpineSkeletonDataResource.cpp
View File

@ -51,7 +51,7 @@ void SpineAnimationMix::_bind_methods() {
SpineAnimationMix::SpineAnimationMix() : from(""), to(""), mix(0) { SpineAnimationMix::SpineAnimationMix() : from(""), to(""), mix(0) {
} }
void SpineAnimationMix::set_from(const StringName &_from) { void SpineAnimationMix::set_from(const String &_from) {
this->from = _from; this->from = _from;
} }
@ -59,7 +59,7 @@ String SpineAnimationMix::get_from() {
return from; return from;
} }
void SpineAnimationMix::set_to(const StringName &_to) { void SpineAnimationMix::set_to(const String &_to) {
this->to = _to; this->to = _to;
} }

4
spine-godot/spine_godot/SpineSkeletonDataResource.h
View File

@ -24,11 +24,11 @@ protected:
public: public:
SpineAnimationMix(); SpineAnimationMix();
void set_from(const StringName &from); void set_from(const String &from);
String get_from(); String get_from();
void set_to(const StringName &to); void set_to(const String &to);
String get_to(); String get_to();