diff options
| author | Kruti Shah | 2012-06-19 15:39:35 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-19 15:39:35 -0700 |
| commit | fee2306d642865b493926063029d44535a2c4d85 (patch) | |
| tree | 230c3ea3e2714b83a7fc32fa84b98b40f46a0ede /js/panels/Timeline/TimelinePanel.reel | |
| parent | a822b95a035715e21d994f6a4c96c3e784107bea (diff) | |
| parent | 8e2dda460526735b4db2949656aa2e8ac041ad3c (diff) | |
| download | ninja-fee2306d642865b493926063029d44535a2c4d85.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 3b6db82e..e06fb422 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -688,6 +688,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 688 | returnObj.layerData.currentKeyframeRule = null; | 688 | returnObj.layerData.currentKeyframeRule = null; |
| 689 | returnObj.layerData.trackPosition = 0; | 689 | returnObj.layerData.trackPosition = 0; |
| 690 | returnObj.layerData.arrStyleTracks = []; | 690 | returnObj.layerData.arrStyleTracks = []; |
| 691 | returnObj.layerData.arrPositionTracks = []; | ||
| 691 | returnObj.layerData.tweens = []; | 692 | returnObj.layerData.tweens = []; |
| 692 | returnObj.layerData.layerTag = ""; | 693 | returnObj.layerData.layerTag = ""; |
| 693 | returnObj.layerData.isVisible = true; | 694 | returnObj.layerData.isVisible = true; |