mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-27 04:01:24 +08:00
Merge branch '4.0' into 4.1-beta
This commit is contained in:
commit
3b57b39c47
@ -418,6 +418,8 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
|
|||||||
data->_spacingMode = SpacingMode_Fixed;
|
data->_spacingMode = SpacingMode_Fixed;
|
||||||
else if (strcmp(item, "percent") == 0)
|
else if (strcmp(item, "percent") == 0)
|
||||||
data->_spacingMode = SpacingMode_Percent;
|
data->_spacingMode = SpacingMode_Percent;
|
||||||
|
else
|
||||||
|
data->_spacingMode = SpacingMode_Proportional;
|
||||||
|
|
||||||
item = Json::getString(constraintMap, "rotateMode", "tangent");
|
item = Json::getString(constraintMap, "rotateMode", "tangent");
|
||||||
if (strcmp(item, "tangent") == 0) data->_rotateMode = RotateMode_Tangent;
|
if (strcmp(item, "tangent") == 0) data->_rotateMode = RotateMode_Tangent;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user