浏览代码

spine-js, fixed FfdTimeline.

NathanSweet 9 年之前
父节点
当前提交
d7633706e7
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      spine-js/spine.js

+ 2 - 1
spine-js/spine.js

@@ -979,7 +979,8 @@ spine.FfdTimeline.prototype = {
 	apply: function (skeleton, lastTime, time, firedEvents, alpha) {
 		var slot = skeleton.slots[this.slotIndex];
 		var slotAttachment = slot.attachment;
-		if (slotAttachment != this.attachment && (!slotAttachment.inheritFFD || slotAttachment.parentMesh != sourceAttachment)) return;
+		if (!slotAttachment) return;
+		if (slotAttachment != this.attachment && (!slotAttachment.inheritFFD || slotAttachment.parentMesh != this.attachment)) return;
 
 		var frames = this.frames;
 		if (time < frames[0]) return; // Time is before first frame.