1 files changed, 18 insertions, 19 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index b9a4574c..2096b3ce 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -302,11 +302,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    // should be unneeded with one element per layer restriction
     _animatedElement:{
         serializable:true,
         value:null
     },
-
     animatedElement:{
         serializable:true,
         get:function () {
@@ -373,24 +373,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     setData:{
         value:function(){
-                if (this.trackData) {
-                    this.bypassAnimation = this.trackData.bypassAnimation;
-                    this.trackID = this.trackData.layerID;
-                    this.tweens = this.trackData.tweens;
-                    this.animatedElement = this.trackData.animatedElement;
-                    this.arrStyleTracks = this.trackData.arrStyleTracks;
-                    this.isTrackAnimated = this.trackData.isTrackAnimated;
-                    this.trackDuration = this.trackData.trackDuration;
-                    this.animationName = this.trackData.animationName;
-                    this.currentKeyframeRule = this.trackData.currentKeyframeRule;
-                    this.isMainCollapsed = this.trackData.isMainCollapsed;
-                    this.isPositionCollapsed = this.trackData.isPositionCollapsed;
-                    this.isTransformCollapsed = this.trackData.isTransformCollapsed;
-                    this.isStyleCollapsed = this.trackData.isStyleCollapsed;
-                    this.trackPosition = this.trackData.trackPosition;
-                    this.needsDraw = true;
-                }
-
+            this.bypassAnimation = this.trackData.bypassAnimation;
+            this.trackID = this.trackData.layerID;
+            this.tweens = this.trackData.tweens;
+            this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction
+            this.arrStyleTracks = this.trackData.arrStyleTracks;
+            this.isTrackAnimated = this.trackData.isTrackAnimated;
+            this.trackDuration = this.trackData.trackDuration;
+            this.animationName = this.trackData.animationName;
+            this.currentKeyframeRule = this.trackData.currentKeyframeRule;
+            this.isMainCollapsed = this.trackData.isMainCollapsed;
+            this.isPositionCollapsed = this.trackData.isPositionCollapsed;
+            this.isTransformCollapsed = this.trackData.isTransformCollapsed;
+            this.isStyleCollapsed = this.trackData.isStyleCollapsed;
+            this.trackPosition = this.trackData.trackPosition;
+            this.needsDraw = true;
         }
     },
     
@@ -433,6 +430,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     draw:{
         value:function () {
             this.ninjaStylesContoller = this.application.ninja.stylesController;
+
+            // animatedElement going away - unneeded below
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
             if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){
                 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];