Merge branch '4.1' into 4.2-beta

EsotericSoftware · Jul 20, 2023 · 1a7e76b · 1a7e76b
2 parents afd4eb3 + 76d220b
commit 1a7e76b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...csoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs b/...csoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs
@@ -68,7 +68,8 @@ public override void OnBehaviourPause (Playable playable, FrameData info) {
 		}
 
 		public override void OnGraphStop (Playable playable) {
-			if (!isPaused && endAtClipEnd)
+			bool isStoppedNotPaused = playable.GetGraph().IsPlaying(); // end of track was reached or graph stopped.
+			if (isStoppedNotPaused && endAtClipEnd)
 				HandleClipEnd();
 		}
 

diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.timeline",
 	"displayName": "Spine Timeline Extensions",
 	"description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity and spine-csharp runtimes as UPM packages (not as spine-unity unitypackage), version 4.2.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)",
-	"version": "4.2.11",
+	"version": "4.2.12",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",