diff options
author | hwc487 | 2012-02-07 14:42:51 -0800 |
---|---|---|
committer | hwc487 | 2012-02-07 14:42:51 -0800 |
commit | 6173fe8440152b1e4c63834a6b4dc7573d532339 (patch) | |
tree | d23449204ae7f23cb9bab09836d126e90c30484b /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
parent | 2d4da18a778471b02e188ad668752e331ee76127 (diff) | |
parent | aec849d91e4b697d496b9ede28b5d89cf2283781 (diff) | |
download | ninja-6173fe8440152b1e4c63834a6b4dc7573d532339.tar.gz |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/helper-classes/RDGE/GLRectangle.js
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rw-r--r-- | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 12 |
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 100644 --- 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 | } |