Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

Conflicts:
	js/helper-classes/RDGE/GLRectangle.js
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/MaterialsLibrary.js

1 files changed, 2 insertions, 0 deletions

diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index 19204470..d2988acf 100644
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -176,6 +176,7 @@ var MaterialsLibrary = Object.create(Object.prototype, {
 
 // create the library of stroke and fill materials
 
+var flatMaterial                                = new FlatMaterial();
 var uberMaterial                                = new UberMaterial();
 var linearGradientMaterial              = new LinearGradientMaterial();
 var radialGradientMaterial              = new RadialGradientMaterial();
@@ -197,6 +198,7 @@ var plasmaMaterial				= new PlasmaMaterial();
 var bumpMetalMaterial                   = new BumpMetalMaterial();
 
 MaterialsLibrary.addMaterial(linearGradientMaterial);
+MaterialsLibrary.addMaterial(flatMaterial);
 MaterialsLibrary.addMaterial(radialGradientMaterial);
 MaterialsLibrary.addMaterial(radialBlurMaterial);
 MaterialsLibrary.addMaterial(pulseMaterial);