diff options
| author | hwc487 | 2012-06-13 14:04:09 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-13 14:04:09 -0700 |
| commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
| tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/Materials/materials-library-panel.reel | |
| parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel')
| -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 205ecd90..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 | |||
| @@ -69,7 +69,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
| 69 | }, | 69 | }, |
| 70 | 70 | ||
| 71 | _materialInfo: { | 71 | _materialInfo: { |
| 72 | enumerable:true | 72 | enumerable:true, |
| 73 | serializable: true | ||
| 73 | }, | 74 | }, |
| 74 | 75 | ||
| 75 | _showMaterialPopup: { | 76 | _showMaterialPopup: { |