Merge branch 'refs/heads/WebGLFileIO' into ToolFixes

Conflicts:
	assets/canvas-runtime.js
	js/controllers/elements/shapes-controller.js
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/geom/line.js
	js/mediators/element-mediator.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index a35f473d..2ca76962 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -121,13 +121,13 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
         // all "live" materials
         this._materials = [];
 
-        // provide the mapping for the asset directory
-        if (assetPath)
-        {
-                this._assetPath = assetPath.slice();
-                if (this._assetPath[this._assetPath.length-1] != '/')
-                        this._assetPath += '/';
-        }
+                // provide the mapping for the asset directory
+                if (assetPath)
+                {
+                        this._assetPath = assetPath.slice();
+                        if (this._assetPath[this._assetPath.length-1] != '/')
+                                this._assetPath += '/';
+                }
 
         if(this._assetPath !== undefined) {
                 RDGE.globals.engine.setAssetPath(this._assetPath);
@@ -638,7 +638,7 @@ NinjaCvsRt.RuntimeGeomObj = function ()
         
                 return mat;     
         };
-        
+
         this.MatrixRotationZ = function( angle )
         {
                 var mat = this.MatrixIdentity(4);
@@ -998,7 +998,7 @@ NinjaCvsRt.RuntimeOval = function ()
                                         mat[5] = yScale;
 
                                         // get the bezier points
-                                        var bezPtsInside = this.circularArcToBezier( Vector.create([0,0,0]), Vector.create([1,0,0]), -2.0*Math.PI );
+                                        var bezPtsInside = this.circularArcToBezier( [0,0,0], [1,0,0], -2.0*Math.PI );
                                         if (bezPtsInside)
                                         {
                                                 n = bezPtsInside.length;
@@ -1465,7 +1465,7 @@ NinjaCvsRt.RuntimeUberMaterial = function ()
                                         // currently not exported
                                         var uvTransform = [ 2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1];
                                         technique.u_uvMatrix.set(uvTransform);
-                                                
+        
                     var tex = null;
                                         if (this._diffuseMap)
                                         {