UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
This commit is contained in:
badlogic 2019-08-19 17:07:23 +02:00
commit 7482e4a212
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
View File

@ -823,7 +823,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
Json *slots = Json::getItem(root, "slots"); Json *slots = Json::getItem(root, "slots");
Json *ik = Json::getItem(root, "ik"); Json *ik = Json::getItem(root, "ik");
Json *transform = Json::getItem(root, "transform"); Json *transform = Json::getItem(root, "transform");
Json *paths = Json::getItem(root, "paths"); Json *paths = Json::getItem(root, "path");
Json *deform = Json::getItem(root, "deform"); Json *deform = Json::getItem(root, "deform");
Json *drawOrder = Json::getItem(root, "drawOrder"); Json *drawOrder = Json::getItem(root, "drawOrder");
Json *events = Json::getItem(root, "events"); Json *events = Json::getItem(root, "events");

1
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
View File

@ -141,7 +141,6 @@ public class JsonRollback {
JsonValue curve = map.get("curve"); JsonValue curve = map.get("curve");
if (curve == null) { if (curve == null) {
if (map.name != null && map.name.equals("color")) System.out.println();
for (JsonValue child = map.child; child != null; child = child.next) for (JsonValue child = map.child; child != null; child = child.next)
rollbackCurves(child); rollbackCurves(child);
return; return;