7 files changed, 371 insertions, 264 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index a5d8997b..fde82d3d 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -101,6 +101,11 @@
                    "id" : "Z-Invert"
                }
            ]
+        },
+        {
+            "label": "Custom Materials",
+            "children": [
+            ]
        }
    ]
 }
 \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index d73134ae..39294779 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -39,6 +39,12 @@ POSSIBILITY OF SUCH DAMAGE.
    margin: 4px 0 4px 0;
 }
+.materials_library_panel .ml_tree_holder {
+    height: 200px;
+    min-height: 200px;
+    max-height: 200px;
+    overflow-y: scroll;
+}
 .ml_buttons {
    clear:both;
@@ -54,9 +60,19 @@ POSSIBILITY OF SUCH DAMAGE.
    cursor: pointer;
    margin: 0 1px;
    float: left;
+    width: 40px;
+}
+.ml_buttons .ml_duplicate_btn {
    width: 60px;
 }
-.ml_buttons .nj-skinned:last-child {
+.ml_buttons .ml_delete_btn {
+    width: 50px;
    float: right;
 }
+.ml_buttons .nj-skinned:hover,
+.ml_buttons .nj-skinned:active {
+    color: white;
+}
+\ No newline at end of file
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 a07e93f5..307f2c5a 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
@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
        <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
         <script type="text/montage-serialization">
        {
-            "addButton": {
+            "duplicateButton": {
                "prototype": "montage/ui/button.reel",
                "properties": {
-                    "element": {"#": "ml_add_btn"},
+                    "element": {"#": "ml_duplicate_btn"},
-                    "enabled": false
+                                        "enabled": true
                },
                "listeners": [
                    {
@@ -47,11 +47,10 @@ POSSIBILITY OF SUCH DAMAGE.
                    }
                ]
             },
-            "copyButton": {
+            "editButton": {
                "prototype": "montage/ui/button.reel",
                "properties": {
-                    "element": {"#": "ml_copy_btn"},
+                    "element": {"#": "ml_edit_btn"}
-                    "enabled": false
               },
                "listeners": [
                    {
@@ -106,7 +105,9 @@ POSSIBILITY OF SUCH DAMAGE.
                "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
                "properties": {
                    "element": {"#": "materials_library_panel"},
-                    "_materialInfo": {"@": "materialInfo"}
+                    "_materialInfo": {"@": "materialInfo"},
+                    "materialsController": {"@": "materialsController"},
+                    "deleteButton": {"@": "deleteButton"}
                }
            }
        }
@@ -116,14 +117,14 @@ POSSIBILITY OF SUCH DAMAGE.
    <body>
        <div data-montage-id="materials_library_panel" class="materials_library_panel">
-            <section data-montage-id="ml_tree_holder" class="animationsLibrary">
+            <section data-montage-id="ml_tree_holder" class="ml_tree_holder">
                <div data-montage-id="materials_library_tree"></div>
            </section>
            <hr />
            <div data-montage-id="ml_buttons" class="ml_buttons">
-                <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
+                <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button>
-                <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
+                <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button>
-                <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
+                <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button>
            </div>
        </div>
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 98a87b07..873184dc 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
@@ -31,14 +31,36 @@ POSSIBILITY OF SUCH DAMAGE.
 var Montage = require("montage/core/core").Montage,
    Component = require("montage/ui/component").Component,
    MaterialsData = require("js/panels/Materials/materials-data.json"),
-    Popup = require("montage/ui/popup/popup.reel").Popup;
+    Popup = require("montage/ui/popup/popup.reel").Popup,
+    MaterialsModel = require("js/models/materials-model").MaterialsModel,
+    LeafNode = require("js/components/treeview/ninja-leaf.reel").Leaf;
 exports.MaterialsLibraryPanel = Montage.create(Component, {
+    deleteButton: {
+        value: null
+    },
    materialsData: {
        value: null
    },
+    materialId: {
+        value: null
+    },
+    selectedMaterialNode: {
+        value: null
+    },
+    customMaterialsBranch: {
+        value: null
+    },
+    customMaterialsCounter: {
+        value: 2
+    },
    _hasFocus: {
        enumerable: false,
        value: false
@@ -60,21 +82,32 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
        value:function(event) {
            switch(event._currentTarget.label)
            {
-                case "Add":
+                case "Duplicate":
-                    console.log("Add new material");
+                    this.duplicateMaterial();
                    break;
-                case "Copy":