Skip to content

Commit e295790

Browse files
committed
Merge branch 'master' of https://github.com/DragonBones/DragonBonesAS into dev
2 parents f07ec7f + 9523122 commit e295790

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

DragonBones/src/dragonBones/objects/ActionData.as

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package dragonBones.objects
2222
{
2323
if (animationConfig)
2424
{
25-
animationConfig..returnToPool();
25+
animationConfig.returnToPool();
2626
}
2727

2828
type = ActionType.None;
@@ -31,4 +31,4 @@ package dragonBones.objects
3131
animationConfig = null;
3232
}
3333
}
34-
}
34+
}

DragonBones/src/dragonBones/parsers/DataParser.as

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462

463463
var i:uint = 0, l:uint = 0;
464464
var insertedFrame:AnimationFrameData = null;
465-
const replacedFrame:AnimationFrameData = frames.length? frames[frameStart] as AnimationFrameData: null;
465+
const replacedFrame:AnimationFrameData = (frames.length > 0 && frameStart < frames.length)? frames[frameStart] as AnimationFrameData: null;
466466

467467
if (replacedFrame && (frameStart == 0 || frames[frameStart - 1] == replacedFrame.prev)) // Key frame.
468468
{
@@ -541,4 +541,4 @@
541541
frames.fixed = true;
542542
}
543543
}
544-
}
544+
}

0 commit comments

Comments
 (0)