1 files changed, 15 insertions, 4 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b41680be..069d3c4b 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -255,12 +255,11 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (value !== this._isSelected) {
                         // Only concerned about different values
                         if (value === false) {
-                                // If changing from false to true, we need to deselect any associated styles
+                                // If changing from true to false, we need to deselect any associated styles
                                 this.selectStyle(false);
                         }
                         this._isSelected = value;
                         this.layerData.isSelected = value;
-                        //this.needsDraw = true;
                 }
             
         }
@@ -381,7 +380,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                 return this._bypassAnimation;
         },
         set: function(newVal) {
-                //console.log("layer.js _bypassAnimation setter " + newVal)
                 this._bypassAnimation = newVal;
         }
     },
@@ -406,7 +404,6 @@ var Layer = exports.Layer = Montage.create(Component, {
 
     setData:{
         value:function(){
-                this.log('layer: setData called')
             this.layerName = this.layerData.layerName;
             this.layerID = this.layerData.layerID;
             this.arrLayerStyles = this.layerData.arrLayerStyles;
@@ -424,9 +421,13 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.dtextScaleX = this.layerData.dtextScaleX;
             this.dtextScaleY = this.layerData.dtextScaleY;
             this.dtextRotate = this.layerData.dtextRotate;
+            this._isFirstDraw = this.layerData._isFirstDraw;
             this.needsDraw = true;
         }
     },
+    _isFirstDraw : {
+        value: true
+    },
 
         /* END: Models */
 
@@ -483,6 +484,16 @@ var Layer = exports.Layer = Montage.create(Component, {
             }
         }
     },
+    didDraw: {
+        value: function() {
+                if ((this.isSelected === true) && (this._isFirstDraw === true)) {
+                        // Once we're done drawing the first time we need to tell the TimelinePanel if
+                        // this layer is supposed to be selected.
+                        this.parentComponent.parentComponent.selectedLayerID = this.layerID;
+                        this._isFirstDraw = false;
+                }
+        }
+    },
         /* End: Draw cycle */
         
         /* Begin: Controllers */