diff options
author | Valerio Virgillito | 2012-03-13 11:31:00 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-13 11:31:00 -0700 |
commit | e464677ee84361d24c77896ee465555629f739dd (patch) | |
tree | 0e7b925f4dedf27f2684915e7e247e79c4a74aff | |
parent | 9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-e464677ee84361d24c77896ee465555629f739dd.tar.gz |
Merge pull request #111 from pushkarjoshi/pentool
Pentool
-rwxr-xr-x | js/lib/geom/sub-path.js | 2 | ||||
-rwxr-xr-x | js/tools/PenTool.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js index 0a65511b..017cca92 100755 --- a/js/lib/geom/sub-path.js +++ b/js/lib/geom/sub-path.js | |||
@@ -73,7 +73,7 @@ var GLSubpath = function GLSubpath() { | |||
73 | this._materialAmbient = [0.2, 0.2, 0.2, 1.0]; | 73 | this._materialAmbient = [0.2, 0.2, 0.2, 1.0]; |
74 | this._materialDiffuse = [0.4, 0.4, 0.4, 1.0]; | 74 | this._materialDiffuse = [0.4, 0.4, 0.4, 1.0]; |
75 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; | 75 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; |
76 | this._fillColor = [0.4, 0.4, 0.4, 1.0]; | 76 | this._fillColor = [1.0, 1.0, 1.0, 0.0]; |
77 | this._fillMaterial = null; | 77 | this._fillMaterial = null; |
78 | this._DISPLAY_ANCHOR_RADIUS = 5; | 78 | this._DISPLAY_ANCHOR_RADIUS = 5; |
79 | //drawing context | 79 | //drawing context |
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 6897c003..60ef4f92 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -467,9 +467,9 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
467 | if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){ | 467 | if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){ |
468 | this._selectedSubpath.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor); | 468 | this._selectedSubpath.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor); |
469 | } | 469 | } |
470 | if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){ | 470 | //if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){ |
471 | this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor); | 471 | // this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor); |
472 | } | 472 | //} |
473 | } //if this is a new path being rendered | 473 | } //if this is a new path being rendered |
474 | 474 | ||
475 | this._selectedSubpath.makeDirty(); | 475 | this._selectedSubpath.makeDirty(); |