aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-08 15:33:30 -0800
committerEric Guzman2012-02-08 15:33:30 -0800
commit4ab650bccc776b031191dc410a93309a9d342bab (patch)
tree55a2c7cdda8cce2ede9a8efcb3e77bfa96abc821 /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
parent7fc8ce44579b0464710d0696782daf7df776b1a0 (diff)
parent0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff)
downloadninja-4ab650bccc776b031191dc410a93309a9d342bab.tar.gz
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js')
-rw-r--r--js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index 61ea808a..e3ffc359 100644
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -14,7 +14,11 @@ exports.InkBottleProperties = Montage.create(ToolProperties, {
14 14
15 _subPrepare: { 15 _subPrepare: {
16 value: function() { 16 value: function() {
17 ShapesController.DisplayMaterials(this._strokeMaterial); 17 Object.defineBinding(this._strokeMaterial, "items", {
18 boundObject: this.application.ninja.appModel,
19 boundObjectPropertyPath: "materials",
20 oneway: false
21 });
18 22
19 this.handleChange(null); 23 this.handleChange(null);
20 this._useWebGL.addEventListener("change", this, false); 24 this._useWebGL.addEventListener("change", this, false);