aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.html
diff options
context:
space:
mode:
authorEric Guzman2012-02-08 14:41:56 -0800
committerEric Guzman2012-02-08 14:41:56 -0800
commit637db74743ac1397ade7edec3da3ae1c1cdaa82a (patch)
treebc16578a5368098956d39f16ddd48737a9bb355c /js/components/tools-properties/fill-properties.reel/fill-properties.html
parent40622aa97d31837254996b718b0a6feca2bcd0ce (diff)
parentab12be4e9a0d9fee4450795077b0107983b5682e (diff)
downloadninja-637db74743ac1397ade7edec3da3ae1c1cdaa82a.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
-rw-r--r--js/components/tools-properties/fill-properties.reel/fill-properties.html11
1 files changed, 10 insertions, 1 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index d09b7f44..a35f9b15 100644
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -11,6 +11,15 @@
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "_fillMaterialCB": {
15 "module": "js/components/combobox.reel",
16 "name": "Combobox",
17 "properties": {
18 "element": {"#": "fillMaterialCB"},
19 "labelField": "_name",
20 "dataField": "_name"
21 }
22 },
14 "owner": { 23 "owner": {
15 "module": "js/components/tools-properties/fill-properties.reel", 24 "module": "js/components/tools-properties/fill-properties.reel",
16 "name": "FillProperties", 25 "name": "FillProperties",
@@ -18,7 +27,7 @@
18 "element": {"#": "fillProperties"}, 27 "element": {"#": "fillProperties"},
19 "_useWebGL": {"#": "useWebGLCH"}, 28 "_useWebGL": {"#": "useWebGLCH"},
20 "_materialsContainer": {"#": "materialsContainer"}, 29 "_materialsContainer": {"#": "materialsContainer"},
21 "_fillMaterial": {"#": "fillMaterialCB"} 30 "_fillMaterial": {"@": "_fillMaterialCB"}
22 } 31 }
23 } 32 }
24 } 33 }