From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 14 Mar 2012 08:59:17 -0700 Subject: Squashed commit of the following: merge master into timeline Signed-off-by: Jonathan Duran --- js/helper-classes/backup-delete/GLCircle.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/helper-classes/backup-delete/GLCircle.js') diff --git a/js/helper-classes/backup-delete/GLCircle.js b/js/helper-classes/backup-delete/GLCircle.js index 15ed6b6d..59d0bdaf 100755 --- a/js/helper-classes/backup-delete/GLCircle.js +++ b/js/helper-classes/backup-delete/GLCircle.js @@ -381,7 +381,6 @@ function GLCircle() // translate var xCtr = 0.5*world.getViewportWidth() + this._xOffset, yCtr = 0.5*world.getViewportHeight() + this._yOffset; - //ctx.setTransform( xScale, 0.0, 0.0, yScale, xCtr, yCtr ); var mat = Matrix.create( [ [ xScale, 0.0, 0.0, xCtr], [ 0.0, yScale, 0.0, yCtr], @@ -538,6 +537,8 @@ function GLCircle() rtnStr += "flatMaterial"; rtnStr += "\n"; + rtnStr += this.exportMaterials(); + return rtnStr; } -- cgit v1.2.3