diff options
| author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
| commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
| tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/components/ui/property-control.reel/property-control.html | |
| parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
| parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
| download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz | |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.html')
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index 2e7c7b53..43e8e67f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html | |||
| @@ -11,14 +11,14 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "substitution1": { | 13 | "substitution1": { |
| 14 | "module": "montage/ui/substitution", | 14 | "module": "montage/ui/substitution.reel", |
| 15 | "name": "Substitution", | 15 | "name": "Substitution", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "propController"} | 17 | "element": {"#": "propController"} |
| 18 | } | 18 | } |
| 19 | }, | 19 | }, |
| 20 | "owner": { | 20 | "owner": { |
| 21 | "module": "js/components/ui/property-control", | 21 | "module": "js/components/ui/property-control.reel", |
| 22 | "name": "PropertyControl", | 22 | "name": "PropertyControl", |
| 23 | "properties": { | 23 | "properties": { |
| 24 | "element": {"#": "propControl"}, | 24 | "element": {"#": "propControl"}, |
| @@ -30,7 +30,7 @@ | |||
| 30 | </script> | 30 | </script> |
| 31 | </head> | 31 | </head> |
| 32 | <body> | 32 | <body> |
| 33 | <div id="propControl"> | 33 | <div id="propControl" class="propControl"> |
| 34 | <div id="propLabel" class="prop-label"></div> | 34 | <div id="propLabel" class="prop-label"></div> |
| 35 | <div id="propController" class="prop-controller"> | 35 | <div id="propController" class="prop-controller"> |
| 36 | <div id="subDummy"></div> | 36 | <div id="subDummy"></div> |