Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.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 edc4f7da..9616b525 100644
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -169,6 +169,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();
@@ -182,6 +183,7 @@ var uberMaterial				= new UberMaterial();
 //var plasmaMaterial                            = new PlasmaMaterial();
 var bumpMetalMaterial                   = new BumpMetalMaterial();
 
+MaterialsLibrary.addMaterial(flatMaterial);
 //MaterialsLibrary.addMaterial(linearGradientMaterial);
 //MaterialsLibrary.addMaterial(radialGradientMaterial);
 //MaterialsLibrary.addMaterial(radialBlurMaterial);