UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-08 11:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed Timeline extension package compile error with latest 3.9-beta updates. Closes #1594.

Browse Source
This commit is contained in:
Harald Csaszar 2020-01-10 12:46:29 +01:00
parent 08491fa765
commit 73ed75cef6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkeletonExtensions.cs
View File

@ -458,5 +458,13 @@ namespace Spine {
return ((int)mode & (1U << ScaleBit)) == 0; return ((int)mode & (1U << ScaleBit)) == 0;
} }
#endregion #endregion
// Note: This extension method is required by SpineAnimationStateMixerBehaviour,
// which is part of the timeline extension package. Thus the internal member variable
// nextTrackLast is not accessible. We favor providing this extension method
// over exposing nextTrackLast as public property, which would rather confuse users.
public static void AllowImmediateQueue (this TrackEntry trackEntry) {
if (trackEntry.nextTrackLast < 0) trackEntry.nextTrackLast = 0;
}
} }
} }

2
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs
View File

@ -161,7 +161,7 @@ namespace Spine.Unity.Playables {
if (!isAnimationTransitionMatch) { if (!isAnimationTransitionMatch) {
dummyAnimationState.ClearTracks(); dummyAnimationState.ClearTracks();
fromTrack = dummyAnimationState.SetAnimation(0, fromAnimation, fromClipLoop); fromTrack = dummyAnimationState.SetAnimation(0, fromAnimation, fromClipLoop);
if (fromTrack.nextTrackLast < 0) fromTrack.nextTrackLast = 0; // fromTrack.AllowImmediateQueue fromTrack.AllowImmediateQueue();
if (toAnimation != null) if (toAnimation != null)
toTrack = dummyAnimationState.SetAnimation(0, toAnimation, clipData.loop); toTrack = dummyAnimationState.SetAnimation(0, toAnimation, clipData.loop);
} }