[c][cpp] Closes #2551, fix inherit transform timelines

EsotericSoftware · Jun 13, 2024 · ccac475 · ccac475
1 parent 314636a
commit ccac475
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c
@@ -535,7 +535,7 @@ static spAnimation *_spSkeletonJson_readAnimation(spSkeletonJson *self, Json *ro
 				keyMap = timelineMap->child;
 				for (frame = 0;; frame++) {
 					float time = Json_getFloat(keyMap, "time", 0);
-					const char *value = Json_getString(keyMap, "value", "normal");
+					const char *value = Json_getString(keyMap, "inherit", "normal");
 					spInherit inherit = SP_INHERIT_NORMAL;
 					if (strcmp(value, "normal") == 0) inherit = SP_INHERIT_NORMAL;
 					else if (strcmp(value, "onlyTranslation") == 0)

diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
@@ -1160,7 +1160,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
 				keyMap = timelineMap->_child;
 				for (frame = 0;; frame++) {
 					float time = Json::getFloat(keyMap, "time", 0);
-					const char *value = Json::getString(keyMap, "value", "normal");
+					const char *value = Json::getString(keyMap, "inherit", "normal");
 					Inherit inherit = Inherit_Normal;
 					if (strcmp(value, "normal") == 0) inherit = Inherit_Normal;
 					else if (strcmp(value, "onlyTranslation") == 0)