diff options
author | mqg734 | 2012-02-21 16:49:11 -0800 |
---|---|---|
committer | mqg734 | 2012-02-21 16:49:11 -0800 |
commit | d2f4d5e5f6742d53b6324d585a700566f73c992a (patch) | |
tree | 8a3de8de6dc5ac5f6f3f0795d00a7d2d788374d7 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | abf78e2d7a97d295ce5a1c425fd359d47379137e (diff) | |
download | ninja-d2f4d5e5f6742d53b6324d585a700566f73c992a.tar.gz |
Updated Materials Library and Materials Editor Popup to work with latest version of Montage.
We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 8 |
1 files changed, 6 insertions, 2 deletions
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 eede02bd..6ba4ac75 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 | |||
@@ -10,14 +10,18 @@ | |||
10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> | 10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "materialInfo": { | ||
14 | "module": "js/panels/Materials/materials-popup.reel", | ||
15 | "name": "MaterialsPopup" | ||
16 | }, | ||
13 | "owner": { | 17 | "owner": { |
14 | "module": "js/panels/Materials/materials-library-panel.reel", | 18 | "module": "js/panels/Materials/materials-library-panel.reel", |
15 | "name": "MaterialsLibraryPanels", | 19 | "name": "MaterialsLibraryPanels", |
16 | "properties": { | 20 | "properties": { |
17 | "element": {"#": "materials_library_panel"} | 21 | "element": {"#": "materials_library_panel"}, |
22 | "_materialInfo": {"@": "materialInfo"} | ||
18 | } | 23 | } |
19 | } | 24 | } |
20 | |||
21 | } | 25 | } |
22 | </script> | 26 | </script> |
23 | 27 | ||