Skip to content

Commit

Permalink
Merge pull request #59 from 2youyouo2/master
Browse files Browse the repository at this point in the history
should always initClipData in reloadClip
  • Loading branch information
jareguo committed Dec 16, 2015
2 parents b0bc5a2 + 769fd4b commit 617346f
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions cocos2d/animation/animation-animator.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,7 @@ p.setStateTime = function (state, time) {

if (CC_EDITOR || CC_TEST) {
p.reloadClip = function (state) {
if (state.isPlaying) {
initClipData(this.target, state);
}
else {
state.curveLoaded = false;
}
initClipData(this.target, state);
};
}

Expand Down

0 comments on commit 617346f

Please sign in to comment.