Merge branch 'refs/heads/ninja-internal' into GIO_Fixes

13 files changed, 449 insertions, 299 deletions

diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index f06ab6c8..a5d8997b 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -5,37 +5,100 @@
             "label": "Ninja Materials",
             "children": [
                 {
-                    "label": "Uber",
-                    "id" : "UberMaterial"
+                    "label": "Bump Metal",
+                    "id" : "Bump Metal"
                 },
                 {
-                    "label": "Bump Metal",
-                    "id" : "BumpMetalMaterial"
+                    "label": "Deform",
+                    "id" : "Deform"
+                },
+                {
+                    "label": "Flag",
+                    "id" : "Flag"
+                },
+                {
+                    "label": "Fly",
+                    "id" : "Fly"
+                },
+                {
+                    "label": "Julia",
+                    "id" : "Julia"
+                },
+                {
+                    "label": "Keleidoscope",
+                    "id" : "Keleidoscope"
                 },
                 {
                     "label": "Linear Gradient",
-                    "id" : "LinearGradientMaterial"
+                    "id" : "Linear Gradient"
+                },
+                {
+                    "label": "Mandel",
+                    "id" : "Mandel"
+                },
+                {
+                    "label": "Paris",
+                    "id" : "Paris"
+                },
+                {
+                    "label": "Plasma",
+                    "id" : "Plasma"
+                },
+                {
+                    "label": "Pulse",
+                    "id" : "Pulse"
+                },
+                {
+                    "label": "Radial Blur",
+                    "id" : "Radial Blur"
                 },
                 {
                     "label": "Radial Gradient",
-                    "id" : "RadialGradientMaterial"
+                    "id" : "Radial Gradient"
                 },
                 {
-                    "label": "Flat",
-                    "id" : "FlatMaterial"
-                }
-            ]
-        },
-        {
-            "label": "Custom Materials",
-            "children": [
+                    "label": "Raiders",
+                    "id" : "Raiders"
+                },
+                {
+                    "label": "Relief Tunnel",
+                    "id" : "Relief Tunnel"
+                },
+                {
+                    "label": "Square Tunnel",
+                    "id" : "Square Tunnel"
+                },
+                {
+                    "label": "Star",
+                    "id" : "Star"
+                },
+                {
+                    "label": "Taper",
+                    "id" : "Taper"
+                },
+                {
+                    "label": "Tunnel",
+                    "id" : "Tunnel"
+                },
+                {
+                    "label": "Twist",
+                    "id" : "Twist"
+                },
+                {
+                    "label": "Twist Vertex",
+                    "id" : "Twist Vertex"
+                },
+                {
+                    "label": "Uber",
+                    "id" : "Uber"
+                },
                 {
-                    "label": "Checker Board",
-                    "id" : "CheckerBoard"
+                    "label": "Water",
+                    "id" : "Water"
                 },
                 {
-                    "label": "Shiny Metal",
-                    "id" : "ShinyMetal"
+                    "label": "Z-Invert",
+                    "id" : "Z-Invert"
                 }
             ]
         }
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index b5d7a869..6fa54495 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -13,7 +13,8 @@
             "addButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_add_btn"}
+                    "element": {"#": "ml_add_btn"},
+                                        "enabled": false
                 },
                 "listeners": [
                     {
@@ -25,8 +26,9 @@
             "copyButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_copy_btn"}
-                },
+                    "element": {"#": "ml_copy_btn"},
+                                        "enabled": false
+               },
                 "listeners": [
                     {
                         "type": "action",
@@ -37,8 +39,9 @@
             "deleteButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_delete_btn"}
-                },
+                    "element": {"#": "ml_delete_btn"},
+                                        "enabled": false
+               },
                 "listeners": [
                     {
                         "type": "action",
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index c600fd0d..cf0d4e93 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -51,14 +51,15 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
 
     handleNodeActivation: {
         value:function(obj) {
-            this._showMaterialPopup(obj.id);
+            this._showMaterialPopup({ materialId: obj.id });
         }
     },
 
     handleShowMaterialPopup: {
         enumerable: false,
         value: function (event) {
-            this._showMaterialPopup(event.detail.materialId);
+            //this._showMaterialPopup(event.detail.materialId);
+            this._showMaterialPopup(event.detail);
         }
     },