diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/panels/Materials/materials-data.json | 13 | ||||
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 13 |
2 files changed, 8 insertions, 18 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 5e86793e..893489fc 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
| @@ -97,19 +97,6 @@ | |||
| 97 | "id" : "ZInvertMaterial" | 97 | "id" : "ZInvertMaterial" |
| 98 | } | 98 | } |
| 99 | ] | 99 | ] |
| 100 | }, | ||
| 101 | { | ||
| 102 | "label": "Custom Materials", | ||
| 103 | "children": [ | ||
| 104 | { | ||
| 105 | "label": "Checker Board", | ||
| 106 | "id" : "CheckerBoard" | ||
| 107 | }, | ||
| 108 | { | ||
| 109 | "label": "Shiny Metal", | ||
| 110 | "id" : "ShinyMetal" | ||
| 111 | } | ||
| 112 | ] | ||
| 113 | } | 100 | } |
| 114 | ] | 101 | ] |
| 115 | } \ No newline at end of file | 102 | } \ 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 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 @@ | |||
| 13 | "addButton": { | 13 | "addButton": { |
| 14 | "prototype": "montage/ui/button.reel", | 14 | "prototype": "montage/ui/button.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "ml_add_btn"} | 16 | "element": {"#": "ml_add_btn"}, |
| 17 | "enabled": false | ||
| 17 | }, | 18 | }, |
| 18 | "listeners": [ | 19 | "listeners": [ |
| 19 | { | 20 | { |
| @@ -25,8 +26,9 @@ | |||
| 25 | "copyButton": { | 26 | "copyButton": { |
| 26 | "prototype": "montage/ui/button.reel", | 27 | "prototype": "montage/ui/button.reel", |
| 27 | "properties": { | 28 | "properties": { |
| 28 | "element": {"#": "ml_copy_btn"} | 29 | "element": {"#": "ml_copy_btn"}, |
| 29 | }, | 30 | "enabled": false |
| 31 | }, | ||
| 30 | "listeners": [ | 32 | "listeners": [ |
| 31 | { | 33 | { |
| 32 | "type": "action", | 34 | "type": "action", |
| @@ -37,8 +39,9 @@ | |||
| 37 | "deleteButton": { | 39 | "deleteButton": { |
| 38 | "prototype": "montage/ui/button.reel", | 40 | "prototype": "montage/ui/button.reel", |
| 39 | "properties": { | 41 | "properties": { |
| 40 | "element": {"#": "ml_delete_btn"} | 42 | "element": {"#": "ml_delete_btn"}, |
| 41 | }, | 43 | "enabled": false |
| 44 | }, | ||
| 42 | "listeners": [ | 45 | "listeners": [ |
| 43 | { | 46 | { |
| 44 | "type": "action", | 47 | "type": "action", |