aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-03-16 13:42:56 -0700
committerJon Reid2012-03-16 13:42:56 -0700
commitf898e3c535da1ec2d6e08bb61c755b8df10da0b1 (patch)
tree3aa61d32eac84572bf1b456c78775cd9900d1bd3
parent3bebf2b279d8f4da0439a4e3de1254c4292d0cac (diff)
parent47c7ba7a500082af0268b39ebbbbe926fa284920 (diff)
downloadninja-f898e3c535da1ec2d6e08bb61c755b8df10da0b1.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b54d6ce0..5287ce28 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -823,4 +823,4 @@ var Layer = exports.Layer = Montage.create(Component, {
823 } 823 }
824 /* End: Logging routines */ 824 /* End: Logging routines */
825 825
826}); \ No newline at end of file 826});
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index be5aace4..a1e320c4 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -718,6 +718,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
718 this._LayerUndoObject = thingToPush; 718 this._LayerUndoObject = thingToPush;
719 this._LayerUndoIndex = thingToPush.layerData.layerID; 719 this._LayerUndoIndex = thingToPush.layerData.layerID;
720 this._LayerUndoStatus = true; 720 this._LayerUndoStatus = true;
721
721 } 722 }
722 723
723 } 724 }