diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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: { |