Ver código fonte

Merge branch '4.1' into 4.2-beta

Harald Csaszar 1 ano atrás
pai
commit
86a320afc2

+ 2 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs

@@ -666,7 +666,7 @@ namespace Spine.Unity {
 			if (mesh == null) {
 			if (mesh == null) {
 				return false;
 				return false;
 			}
 			}
-			if (mesh.vertexCount == 0) {
+			if (mesh.vertexCount == 0 || mesh.bounds.size == Vector3.zero) {
 				this.rectTransform.sizeDelta = new Vector2(50f, 50f);
 				this.rectTransform.sizeDelta = new Vector2(50f, 50f);
 				this.rectTransform.pivot = new Vector2(0.5f, 0.5f);
 				this.rectTransform.pivot = new Vector2(0.5f, 0.5f);
 				return false;
 				return false;
@@ -698,7 +698,7 @@ namespace Spine.Unity {
 				}
 				}
 			}
 			}
 
 
-			if (!anyBoundsAdded) {
+			if (!anyBoundsAdded || combinedBounds.size == Vector3.zero) {
 				this.rectTransform.sizeDelta = new Vector2(50f, 50f);
 				this.rectTransform.sizeDelta = new Vector2(50f, 50f);
 				this.rectTransform.pivot = new Vector2(0.5f, 0.5f);
 				this.rectTransform.pivot = new Vector2(0.5f, 0.5f);
 				return false;
 				return false;

+ 1 - 1
spine-unity/Assets/Spine/package.json

@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.spine-unity",
 	"name": "com.esotericsoftware.spine.spine-unity",
 	"displayName": "spine-unity Runtime",
 	"displayName": "spine-unity Runtime",
 	"description": "This plugin provides the spine-unity runtime core.",
 	"description": "This plugin provides the spine-unity runtime core.",
-	"version": "4.2.56",
+	"version": "4.2.57",
 	"unity": "2018.3",
 	"unity": "2018.3",
 	"author": {
 	"author": {
 		"name": "Esoteric Software",
 		"name": "Esoteric Software",