diff options
author | Jon Reid | 2012-04-26 13:13:17 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-26 13:13:17 -0700 |
commit | ddbc1ac7eb35fee9254f4842fe29ab35de3d214c (patch) | |
tree | 3cfacd0f4714e929584e7bb915dfd3613fb74226 /js/lib/geom/circle.js | |
parent | 47e63e06fe01a1d66d3909b5f6acc0d987f97d9d (diff) | |
parent | 53eba0fe1bd27396a8b7cb7828e51457d8d9576a (diff) | |
download | ninja-ddbc1ac7eb35fee9254f4842fe29ab35de3d214c.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index 1073c2db..218dcfa6 100755 --- a/js/lib/geom/circle.js +++ b/js/lib/geom/circle.js | |||
@@ -457,9 +457,9 @@ var Circle = function GLCircle() { | |||
457 | if(this._fillColor.gradientMode) { | 457 | if(this._fillColor.gradientMode) { |
458 | if(this._fillColor.gradientMode === "radial") { | 458 | if(this._fillColor.gradientMode === "radial") { |
459 | gradient = ctx.createRadialGradient(xCtr, yCtr, 0, | 459 | gradient = ctx.createRadialGradient(xCtr, yCtr, 0, |
460 | xCtr, yCtr, Math.max(yScale, xScale)); | 460 | xCtr, yCtr, Math.max(this._width, this._height)/2); |
461 | } else { | 461 | } else { |
462 | gradient = ctx.createLinearGradient(0, this._height/2, this._width, this._height/2); | 462 | gradient = ctx.createLinearGradient(lineWidth/2, this._height/2, this._width-lineWidth, this._height/2); |
463 | } | 463 | } |
464 | colors = this._fillColor.color; | 464 | colors = this._fillColor.color; |
465 | 465 | ||