Merge branch '3.6' into 3.7-beta

2025-12-20 17:26:01 +08:00 · 2018-01-24 14:30:47 +01:00 · 2018-01-24 14:30:47 +01:00 · 713f43a247
commit 713f43a247
parent 6a556de014 16d799002d
4 changed files with 1 additions and 0 deletions
--- a/spine-as3/spine-as3-example/lib/spine-as3.swc
+++ b/spine-as3/spine-as3-example/lib/spine-as3.swc
--- a/spine-as3/spine-as3/src/spine/Skeleton.as
+++ b/spine-as3/spine-as3/src/spine/Skeleton.as
@ -218,6 +218,7 @@ package spine {
 		}

 		private function sortPathConstraintAttachment(skin : Skin, slotIndex : int, slotBone : Bone) : void {
+			if (!skin.attachments.hasOwnProperty(slotIndex)) return;
 			var dict : Dictionary = skin.attachments[slotIndex];
 			if (!dict) return;

--- a/spine-starling/spine-starling-example/lib/spine-as3.swc
+++ b/spine-starling/spine-starling-example/lib/spine-as3.swc
--- a/spine-starling/spine-starling/lib/spine-as3.swc
+++ b/spine-starling/spine-starling/lib/spine-as3.swc