diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | 3 |
1 files changed, 2 insertions, 1 deletions
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 2176c6d5..c600fd0d 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 | |||
| @@ -68,7 +68,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
| 68 | }, | 68 | }, |
| 69 | 69 | ||
| 70 | _materialInfo: { | 70 | _materialInfo: { |
| 71 | enumerable:true | 71 | enumerable:true, |
| 72 | serializable: true | ||
| 72 | }, | 73 | }, |
| 73 | 74 | ||
| 74 | _showMaterialPopup: { | 75 | _showMaterialPopup: { |