aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-04-25 16:42:14 -0700
committerJon Reid2012-04-25 16:42:14 -0700
commit37cd368207f250e4408eb1aaffc1d404b587420b (patch)
tree7e8438425a7c21d6281e66adf842864ff365900f
parentc209fefbd7fffea925b39bfc5594b1a26712a458 (diff)
parent3fe0eb59a58db8812260fef57710326f8e660d7a (diff)
downloadninja-37cd368207f250e4408eb1aaffc1d404b587420b.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 77a4daae..ef85e067 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -955,6 +955,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
955 955
956 this.currentLayerNumber = this.currentLayerNumber + 1; 956 this.currentLayerNumber = this.currentLayerNumber + 1;
957 newLayerName = "Layer " + this.currentLayerNumber; 957 newLayerName = "Layer " + this.currentLayerNumber;
958
959 for(k = 0; k < arrLayersLength; k++){
960 if(this.arrLayers[k].layerData.layerName === newLayerName){
961 this.currentLayerNumber = this.currentLayerNumber + 1;
962 newLayerName = "Layer " + this.currentLayerNumber;
963 break;
964 }
965 }
958 thingToPush.layerData.layerName = newLayerName; 966 thingToPush.layerData.layerName = newLayerName;
959 thingToPush.layerData.layerTag = "<" + object.nodeName.toLowerCase() + ">"; 967 thingToPush.layerData.layerTag = "<" + object.nodeName.toLowerCase() + ">";
960 thingToPush.layerData.layerID = this.currentLayerNumber; 968 thingToPush.layerData.layerID = this.currentLayerNumber;