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/line.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/line.js')
| -rwxr-xr-x | js/lib/geom/line.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index 8ee39098..bb198d83 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
| @@ -33,6 +33,8 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok | |||
| 33 | this._scaleX = 1.0; | 33 | this._scaleX = 1.0; |
| 34 | this._scaleY = 1.0; | 34 | this._scaleY = 1.0; |
| 35 | 35 | ||
| 36 | this.canFill = false; | ||
| 37 | |||
| 36 | if (arguments.length > 0) { | 38 | if (arguments.length > 0) { |
| 37 | this._width = width; | 39 | this._width = width; |
| 38 | this._height = height; | 40 | this._height = height; |