Merge branch '4.0' into 4.1-beta

This commit is contained in:
Mario Zechner 2022-04-07 08:30:38 +02:00
commit 3b57b39c47

View File

@ -418,6 +418,8 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
data->_spacingMode = SpacingMode_Fixed;
else if (strcmp(item, "percent") == 0)
data->_spacingMode = SpacingMode_Percent;
else
data->_spacingMode = SpacingMode_Proportional;
item = Json::getString(constraintMap, "rotateMode", "tangent");
if (strcmp(item, "tangent") == 0) data->_rotateMode = RotateMode_Tangent;