diff options
| author | Jon Reid | 2012-06-19 18:05:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-19 18:05:10 -0700 |
| commit | 8069a7626339f5076ba5cb433f1e7376660e11eb (patch) | |
| tree | f6ee3352218996da8d91c0a6977a28c3f4b83d56 /js/panels/Timeline/TimelinePanel.reel | |
| parent | 0da75e4de7373ed361b5d76be4ee192453146dde (diff) | |
| parent | 8e2dda460526735b4db2949656aa2e8ac041ad3c (diff) | |
| download | ninja-8069a7626339f5076ba5cb433f1e7376660e11eb.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 092176dc..89389469 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -702,6 +702,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 702 | returnObj.layerData.currentKeyframeRule = null; | 702 | returnObj.layerData.currentKeyframeRule = null; |
| 703 | returnObj.layerData.trackPosition = 0; | 703 | returnObj.layerData.trackPosition = 0; |
| 704 | returnObj.layerData.arrStyleTracks = []; | 704 | returnObj.layerData.arrStyleTracks = []; |
| 705 | returnObj.layerData.arrPositionTracks = []; | ||
| 705 | returnObj.layerData.tweens = []; | 706 | returnObj.layerData.tweens = []; |
| 706 | returnObj.layerData.layerTag = ""; | 707 | returnObj.layerData.layerTag = ""; |
| 707 | returnObj.layerData.isVisible = true; | 708 | returnObj.layerData.isVisible = true; |