aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authormayhewinator2012-05-15 15:55:42 -0700
committermayhewinator2012-05-15 15:55:42 -0700
commit64d32b512c94fb470654897bfa799b248122431b (patch)
treed0e5b4af9f6ca1d8bf4de7d728619083a1b2e77d /js/components
parent6bced2460423b144c6327e7a21d27bd8f279cbd3 (diff)
parentdcbdd4d4be9a02e792bce445ab360b72d66fa326 (diff)
downloadninja-64d32b512c94fb470654897bfa799b248122431b.tar.gz
Merge pull request #1 from mencio/WorkingBranch
Working branch - Adding the color pre-flight for the Tag tool
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js
index 1357ba67..52c6f44c 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.js
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -72,7 +72,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
72 handleFillColorChange: { 72 handleFillColorChange: {
73 value: function (e) { 73 value: function (e) {
74 this.fill = e._event; 74 this.fill = e._event;
75 this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color); 75// this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color);
76 } 76 }
77 }, 77 },
78 78