diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /js/lib/geom/brush-stroke.js | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'js/lib/geom/brush-stroke.js')
| -rwxr-xr-x | js/lib/geom/brush-stroke.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js index 8c5ffef3..efd21c4a 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
| @@ -44,6 +44,9 @@ var BrushStroke = function GLBrushStroke() { | |||
| 44 | this._strokeAngle = 0; | 44 | this._strokeAngle = 0; |
| 45 | this._strokeAmountSmoothing = 0; | 45 | this._strokeAmountSmoothing = 0; |
| 46 | 46 | ||
| 47 | // currently, brush does not support a fill region | ||
| 48 | this.canFill = false; | ||
| 49 | |||
| 47 | //threshold that tells us whether two samples are too far apart | 50 | //threshold that tells us whether two samples are too far apart |
| 48 | this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5; | 51 | this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5; |
| 49 | 52 | ||