diff --git a/examples/owl/export/owl-pro.json b/examples/owl/export/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/examples/owl/export/owl-pro.json +++ b/examples/owl/export/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/examples/owl/export/owl-pro.skel b/examples/owl/export/owl-pro.skel index dfe0a9704c..99abf61e0b 100644 Binary files a/examples/owl/export/owl-pro.skel and b/examples/owl/export/owl-pro.skel differ diff --git a/examples/owl/owl-pro.spine b/examples/owl/owl-pro.spine index 257b77c37f..85defbf620 100755 Binary files a/examples/owl/owl-pro.spine and b/examples/owl/owl-pro.spine differ diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp index 8926859ae1..e634941683 100644 --- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp @@ -349,7 +349,7 @@ void Skeleton::setSkin(Skin *newSkin) { } Attachment *Skeleton::getAttachment(const String &slotName, const String &attachmentName) { - return getAttachment(_data->findSlot(slotName)->index, attachmentName); + return getAttachment(_data->findSlot(slotName)->getIndex(), attachmentName); } Attachment *Skeleton::getAttachment(int slotIndex, const String &attachmentName) { diff --git a/spine-sfml/c/data/owl-pro.json b/spine-sfml/c/data/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/spine-sfml/c/data/owl-pro.json +++ b/spine-sfml/c/data/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/spine-sfml/c/data/owl-pro.skel b/spine-sfml/c/data/owl-pro.skel index dfe0a9704c..99abf61e0b 100644 Binary files a/spine-sfml/c/data/owl-pro.skel and b/spine-sfml/c/data/owl-pro.skel differ diff --git a/spine-sfml/cpp/data/owl-pro.json b/spine-sfml/cpp/data/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/spine-sfml/cpp/data/owl-pro.json +++ b/spine-sfml/cpp/data/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/spine-sfml/cpp/data/owl-pro.skel b/spine-sfml/cpp/data/owl-pro.skel index dfe0a9704c..99abf61e0b 100644 Binary files a/spine-sfml/cpp/data/owl-pro.skel and b/spine-sfml/cpp/data/owl-pro.skel differ diff --git a/spine-solar2d/data/owl-pro.json b/spine-solar2d/data/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/spine-solar2d/data/owl-pro.json +++ b/spine-solar2d/data/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/spine-starling/spine-starling-example/src/owl-pro.json b/spine-starling/spine-starling-example/src/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/spine-starling/spine-starling-example/src/owl-pro.json +++ b/spine-starling/spine-starling-example/src/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/spine-ts/spine-webgl/example/assets/owl-pro.json b/spine-ts/spine-webgl/example/assets/owl-pro.json index 52f493b6f4..d35dff5e10 100644 --- a/spine-ts/spine-webgl/example/assets/owl-pro.json +++ b/spine-ts/spine-webgl/example/assets/owl-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "5OTv2PhCedw", + "hash": "D48YMP6TYgI", "spine": "4.0.31", "x": -644, "y": -274, @@ -696,17 +696,6 @@ { "time": 6, "value": -4.1 }, { "time": 6.6667 } ] - }, - "control": { - "rotate": [ - {} - ], - "translate": [ - {} - ], - "scale": [ - {} - ] } } }, diff --git a/spine-ts/spine-webgl/example/assets/owl-pro.skel b/spine-ts/spine-webgl/example/assets/owl-pro.skel index dfe0a9704c..99abf61e0b 100644 Binary files a/spine-ts/spine-webgl/example/assets/owl-pro.skel and b/spine-ts/spine-webgl/example/assets/owl-pro.skel differ