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 '3.8' into 4.0-beta

Browse Source
This commit is contained in:
Harald Csaszar 2021-02-16 20:01:25 +01:00
commit ad0cbe21ba
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-cpp/spine-cpp/include/spine/AnimationState.h
View File

@ -387,6 +387,14 @@ namespace spine {
void enableQueue(); void enableQueue();
private: private:
static const int Subsequent = 0;
static const int First = 1;
static const int HoldSubsequent = 2;
static const int HoldFirst = 3;
static const int HoldMix = 4;
static const int Setup = 1;
static const int Current = 2;
AnimationStateData* _data; AnimationStateData* _data;

9
spine-cpp/spine-cpp/src/spine/AnimationState.cpp
View File

@ -288,15 +288,6 @@ void EventQueue::drain() {
_drainDisabled = false; _drainDisabled = false;
} }
const int Subsequent = 0;
const int First = 1;
const int HoldSubsequent = 2;
const int HoldFirst = 3;
const int HoldMix = 4;
const int Setup = 1;
const int Current = 2;
AnimationState::AnimationState(AnimationStateData *data) : AnimationState::AnimationState(AnimationStateData *data) :
_data(data), _data(data),
_queue(EventQueue::newEventQueue(*this, _trackEntryPool)), _queue(EventQueue::newEventQueue(*this, _trackEntryPool)),

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs
View File

@ -90,7 +90,7 @@ namespace Spine.Unity.Editor {
protected void TrySetAnimation (SkeletonAnimation skeletonAnimation) { protected void TrySetAnimation (SkeletonAnimation skeletonAnimation) {
if (skeletonAnimation == null) return; if (skeletonAnimation == null) return;
if (!skeletonAnimation.valid) if (!skeletonAnimation.valid || skeletonAnimation.AnimationState == null)
return; return;
TrackEntry current = skeletonAnimation.AnimationState.GetCurrent(0); TrackEntry current = skeletonAnimation.AnimationState.GetCurrent(0);