aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 13:14:47 -0800
committerJose Antonio Marquez2012-02-08 13:14:47 -0800
commit553e06c9e903e845cb9cd73971d59561fca375c7 (patch)
treeb85718d3c307c4693be75774ed68191bce9aebbf /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
parent4bfac53c9a77a3af35d029757eece53f4b7212ed (diff)
parent10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
downloadninja-553e06c9e903e845cb9cd73971d59561fca375c7.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index b98a7b4c..1602e793 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -36,6 +36,16 @@
36 } 36 }
37 }, 37 },
38 38
39 "_strokeMaterialCB": {
40 "module": "js/components/combobox.reel",
41 "name": "Combobox",
42 "properties": {
43 "element": {"#": "strokeMaterialIBCB"},
44 "labelField": "_name",
45 "dataField": "_name"
46 }
47 },
48
39 "owner": { 49 "owner": {
40 "module": "js/components/tools-properties/ink-bottle-properties.reel", 50 "module": "js/components/tools-properties/ink-bottle-properties.reel",
41 "name": "InkBottleProperties", 51 "name": "InkBottleProperties",
@@ -49,7 +59,7 @@
49 59
50 "_useWebGL": {"#": "useWebGLCHIB"}, 60 "_useWebGL": {"#": "useWebGLCHIB"},
51 "_materialsContainer": {"#": "materialsContainerIB"}, 61 "_materialsContainer": {"#": "materialsContainerIB"},
52 "_strokeMaterial": {"#": "strokeMaterialIBCB"} 62 "_strokeMaterial": {"@": "_strokeMaterialCB"}
53 } 63 }
54 } 64 }
55 } 65 }