Merge branch 'refs/heads/ninja-internal' into WebGLFixes

Conflicts:
	js/helper-classes/RDGE/GLMaterial.js
	js/helper-classes/RDGE/GLRectangle.js
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/FlatMaterial.js
	js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
	js/helper-classes/RDGE/Materials/JuliaMaterial.js
	js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
	js/helper-classes/RDGE/Materials/MandelMaterial.js
	js/helper-classes/RDGE/Materials/PlasmaMaterial.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
	js/helper-classes/RDGE/Materials/TunnelMaterial.js
	js/helper-classes/RDGE/Materials/TwistMaterial.js
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/src/core/script/renderer.js
	js/panels/Materials/Materials.xml

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

1 files changed, 5 insertions, 2 deletions

diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index e3b14bf7..fdf1595c 100644
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -4,10 +4,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-// Todo: This shoudl be converted to a module
+// Todo: This entire class should be converted to a module
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 
-
 ///////////////////////////////////////////////////////////////////////
 // Class GLBrushStroke
 //      representation a sequence points (polyline) created by brush tool.
@@ -141,6 +140,10 @@ function GLBrushStroke() {
         this._dirty = false;
     }
 
+    this.buildBuffers = function () {
+        return; //no need to do anything for now
+    }//buildBuffers()
+
     //render
     //  specify how to render the subpath in Canvas2D
     this.render = function () {