Просмотр исходного кода

Merge branch '3.8' into 3.9-beta

badlogic 6 лет назад
Родитель
Сommit
7482e4a212

+ 1 - 1
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp

@@ -823,7 +823,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
 	Json *slots = Json::getItem(root, "slots");
 	Json *ik = Json::getItem(root, "ik");
 	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 *drawOrder = Json::getItem(root, "drawOrder");
 	Json *events = Json::getItem(root, "events");

+ 0 - 1
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java

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