diff options
| author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
| commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
| tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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: { |