From c9de3b8776719005c82be8a7a526736b394631db Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Tue, 11 Feb 2025 14:05:44 +0100
Subject: [PATCH] [cpp] Fix JSON parsing of transform constraint timelines,
 path constraint mix timeline constant. Closes #2736

---
 spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h | 2 +-
 spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
index 5a6b7bba3..81663057f 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
@@ -61,7 +61,7 @@ namespace spine {
 		static const int ENTRIES = 4;
 		static const int ROTATE = 1;
 		static const int X = 2;
-		static const int Y = 2;
+		static const int Y = 3;
 	};
 }
 
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
index c9d6cf264..242d9a9bd 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
@@ -1278,7 +1278,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
 			mixY = mixY2;
 			mixScaleX = mixScaleX2;
 			mixScaleY = mixScaleY2;
-			mixScaleX = mixScaleX2;
+			mixShearY = mixShearY2;
 			keyMap = nextMap;
 		}