소스 검색

[cpp] Fix JSON parsing of transform constraint timelines, path constraint mix timeline constant. Closes #2736

Mario Zechner 7 달 전
부모
커밋
c9de3b8776
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
  2. 1 1
      spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp

+ 1 - 1
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;
 	};
 }
 

+ 1 - 1
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;
 		}