Merge branch 'refs/heads/NinjaInternal' into Color

78 files changed, 1615 insertions, 1480 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
new file mode 100644
index 00000000..53bfb684
--- /dev/null
+++ b/assets/descriptor.json
@@ -0,0 +1,34 @@
+{
+        "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.",
+        "version": "0.0.0.0",
+        "root": "/assets/",
+        "directories": [{"name": "images"}, {"name": "shaders"}],
+        "files": [
+                "images/black.png",
+                "images/blue.png",
+                "images/BoxB2_AO.png",
+                "images/BoxB2_DM.png",
+                "images/cubelight.png",
+                "images/grey.png",
+                "images/material_paint.png",
+                "images/metal.png",
+                "images/normalMap.png",
+                "images/random_normal.png",
+                "images/rocky-diffuse.jpg",
+                "images/rocky-normal.jpg",
+                "images/rocky-spec.jpg",
+                "images/silver.png",
+                "images/white.png",
+                "shaders/Basic.frag.glsl",
+                "shaders/Basic.vert.glsl",
+                "shaders/linearGradient.frag.glsl",
+                "shaders/linearGradient.vert.glsl",
+                "shaders/radialGradient.frag.glsl",
+                "shaders/radialGradient.vert.glsl",
+                "shaders/test_fshader.glsl",
+                "shaders/test_fshader_full.glsl",
+                "shaders/test_vshader.glsl",
+                "shaders/ub_fshader.glsl",
+                "shaders/ub_vshader.glsl"
+        ]
+}
\ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index d22cfc22..824a675a 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #sceneBar { height: 70px; background-color: #474747; }
 
-#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; }
+#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;}
 
-#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; }
+#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;}
 
 #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
 
@@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; }
 
+.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); }
+
 #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; }
 
 #mainStageIFrame { border: none; margin: 4px; }
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index 03ef7b9e..1e9222fd 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: 'children'
+        value: null
     },
 
     _root : {
@@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
    },
 
     branchControllers: {
-        value: []
+        value: [],
+        distinct: true
     },
 
     addBranchController : {
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index d8c212e8..a3a9350e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,7 @@