diff options
author | hwc487 | 2012-02-21 17:02:31 -0800 |
---|---|---|
committer | hwc487 | 2012-02-21 17:02:31 -0800 |
commit | f06f44ab3fcca109f126eae4f6fb915c5dd28791 (patch) | |
tree | c25fbfedf93c135be53f1e9238f7ddcf498612bc /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | bd7bc833895391e4974b8746f31f63ba70689df3 (diff) | |
parent | d2f4d5e5f6742d53b6324d585a700566f73c992a (diff) | |
download | ninja-f06f44ab3fcca109f126eae4f6fb915c5dd28791.tar.gz |
Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integration
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 | ||