diff options
| author | Nivesh Rajbhandari | 2012-04-18 12:08:46 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-18 12:08:46 -0700 |
| commit | fb20a74856a8c272d09d106765eb2e44c883f0c3 (patch) | |
| tree | d41468b2fff52d73c6308de9730c17be05a71394 /js/lib/geom/line.js | |
| parent | e2510cba3b75bba78c587d784f39c137c1618369 (diff) | |
| parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
| download | ninja-fb20a74856a8c272d09d106765eb2e44c883f0c3.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into EricMerge
Conflicts:
js/tools/Rotate3DToolBase.js
js/tools/RotateStage3DTool.js
js/tools/Translate3DToolBase.js
js/tools/modifier-tool-base.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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; |