[runtime] Revert changes to owl-pro.spine

Conversion to 4.0.31 and export breaks additive blending even more.
Libnezz · Sep 13, 2021 · c41cc94 · c41cc94
1 parent 67c0d39
commit c41cc94
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 73 deletions.
diff --git 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
diff --git a/examples/owl/owl-pro.spine b/examples/owl/owl-pro.spine
diff --git 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
@@ -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
diff --git 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
diff --git 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
@@ -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
@@ -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